Merge pull request #24 from tamcore/configmap-updates

configMap updates
traccar · Feb 20, 2023 · f18572c · f18572c
2 parents c6d2dce + 4160552
commit f18572c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/charts/traccar/Chart.yaml b/charts/traccar/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: traccar
 description: A Helm chart for Traccar GPS Server
 type: application
-version: 1.5.0
+version: 1.6.0
 appVersion: "5.6"
 dependencies:
   - name: mysql

diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml
@@ -6,6 +6,9 @@ metadata:
     {{- include "traccar.labels" . | nindent 4 }}
 data:
   traccar.xml: |
+{{- if .Values.configOverride }}
+    {{- .Values.configOverride | nindent 4 }}
+{{- else }}
     <?xml version='1.0' encoding='UTF-8'?>
     <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
     <properties>
@@ -44,7 +47,7 @@ data:
 {{- if .Values.traccar.web.application }}
         <entry key='web.application'>{{ .Values.traccar.web.application }}</entry>
 {{- end }}
-        <entry key='web.healthCheck'>false</entry>
+        <entry key='web.disableHealthCheck'>true</entry>
 {{- end }}
 {{- if .Values.traccar.geocoder }}
 {{- if .Values.traccar.geocoder.enable }}
@@ -271,6 +274,9 @@ data:
 {{- end }}
 {{- if .Values.traccar.mail }}
 {{- if .Values.traccar.mail.smtp }}
+{{- if .Values.traccar.mail.smtp.ignoreUserConfig }}
+        <entry key='mail.smtp.ignoreUserConfig'>{{ .Values.traccar.mail.smtp.ignoreUserConfig }}</entry>
+{{- end }}
 {{- if .Values.traccar.mail.smtp.host }}
         <entry key='mail.smtp.host'>{{ .Values.traccar.mail.smtp.host }}</entry>
 {{- end }}
@@ -296,11 +302,14 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- if .Values.traccar.mail.debug }}
+        <entry key='mail.debug'>{{ .Values.traccar.mail.debug }}</entry>
+{{- end }}
 {{- if .Values.traccar.mail.smtp.from}}
-        <entry key='mail.smtp.debug'>{{ .Values.traccar.mail.smtp.from}}</entry>
+        <entry key='mail.smtp.from'>{{ .Values.traccar.mail.smtp.from }}</entry>
 {{- end }}
-{{- if .Values.traccar.mail.smtp.auth }}
-        <entry key='mail.smtp.auth'>{{ .Values.traccar.mail.smtp.auth }}</entry>
+{{- if .Values.traccar.mail.smtp.fromName }}
+        <entry key='mail.smtp.fromName'>{{ .Values.traccar.mail.smtp.fromName }}</entry>
 {{- end }}
 {{- if .Values.traccar.mail.smtp.username }}
         <entry key='mail.smtp.username'>{{ .Values.traccar.mail.smtp.username }}</entry>
@@ -394,3 +403,4 @@ data:
 {{- end }}
 {{- end }}
     </properties>
+{{- end }}
diff --git a/charts/traccar/values.yaml b/charts/traccar/values.yaml
@@ -863,6 +863,17 @@ externalService:
     port: 5228
     targetPort: thinkpower
 
+# This allows you to provide the entire config from scratch.
+# configOverride: |
+#   <?xml version='1.0' encoding='UTF-8'?>
+#   <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
+#   <properties>
+#       <entry key='config.default'>./conf/default.xml</entry>
+#       <entry key='web.enable'>true</entry>
+#       <entry key='web.disableHealthCheck'>true</entry>
+#       <entry key='....'>....</entry>
+#   </properties>
+
 resources: {}
 
 nodeSelector: