From aa9d2de5c3daf1a4d39015283f33d6119dc6d441 Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:22:46 +0100 Subject: [PATCH 1/7] Added additional telegram config --- charts/traccar/templates/configmap.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml index a54b9ea..f2ed896 100644 --- a/charts/traccar/templates/configmap.yaml +++ b/charts/traccar/templates/configmap.yaml @@ -354,5 +354,19 @@ data: {{- if .Values.traccar.sms.enable }} {{ .Values.traccar.sms.enable }} {{- end }} +{{- end }} + +{{- if .Values.traccar.notificator }} +{{- if .Values.traccar.notificator.types }} + {{ .Values.traccar.notificator.types }} +{{- end }} +{{- if .Values.traccar.telegram }} +{{- if .Values.traccar.telegram.key }} + {{ .Values.traccar.notificator.telegram.key }} +{{- end }} +{{- if .Values.traccar.telegram.chatId }} + {{ .Values.traccar.notificator.telegram.chatId }} +{{- end }} +{{- end }} {{- end }} From 8b39dc219ff662ae2f48b53a5f84d56c57b34ca7 Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:25:36 +0100 Subject: [PATCH 2/7] Added sms config --- charts/traccar/templates/configmap.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml index f2ed896..cf2331c 100644 --- a/charts/traccar/templates/configmap.yaml +++ b/charts/traccar/templates/configmap.yaml @@ -354,6 +354,17 @@ data: {{- if .Values.traccar.sms.enable }} {{ .Values.traccar.sms.enable }} {{- end }} +{{- if .Values.traccar.sms.http }} +{{- if .Values.traccar.sms.http.url }} + {{ .Values.traccar.sms.http.url }} +{{- end }} +{{- if .Values.traccar.sms.http.authorization }} + {{ .Values.traccar.sms.http.authorization }} +{{- end }} +{{- if .Values.traccar.sms.http.template }} + {{ .Values.traccar.sms.http.template }} +{{- end }} +{{- end }} {{- end }} {{- if .Values.traccar.notificator }} From 7dbb9db471e7bca3179d119af83c877e4cda5926 Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:26:49 +0100 Subject: [PATCH 3/7] Added traccar key config --- charts/traccar/templates/configmap.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml index cf2331c..c51f69b 100644 --- a/charts/traccar/templates/configmap.yaml +++ b/charts/traccar/templates/configmap.yaml @@ -371,6 +371,11 @@ data: {{- if .Values.traccar.notificator.types }} {{ .Values.traccar.notificator.types }} {{- end }} +{- if .Values.traccar.notificator.traccar }} +{- if .Values.traccar.notificator.traccar.key }} + {{ .Values.traccar.notificator.traccar.key }} +{{- end }} +{{- end }} {{- if .Values.traccar.telegram }} {{- if .Values.traccar.telegram.key }} {{ .Values.traccar.notificator.telegram.key }} From 456262bee17a4884c9862f29c186dfbabd482ab2 Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:28:44 +0100 Subject: [PATCH 4/7] Added firebase config --- charts/traccar/templates/configmap.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml index c51f69b..601016c 100644 --- a/charts/traccar/templates/configmap.yaml +++ b/charts/traccar/templates/configmap.yaml @@ -376,6 +376,11 @@ data: {{ .Values.traccar.notificator.traccar.key }} {{- end }} {{- end }} +{- if .Values.traccar.notificator.firebase }} +{- if .Values.traccar.notificator.firebase.serviceAccount }} + {{ .Values.traccar.notificator.firebase.serviceAccount }} +{{- end }} +{{- end }} {{- if .Values.traccar.telegram }} {{- if .Values.traccar.telegram.key }} {{ .Values.traccar.notificator.telegram.key }} From ef26856f8ce45e2da122e7fb660eb4ff022abc44 Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:33:24 +0100 Subject: [PATCH 5/7] Fix --- charts/traccar/templates/configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml index 601016c..d049690 100644 --- a/charts/traccar/templates/configmap.yaml +++ b/charts/traccar/templates/configmap.yaml @@ -381,11 +381,11 @@ data: {{ .Values.traccar.notificator.firebase.serviceAccount }} {{- end }} {{- end }} -{{- if .Values.traccar.telegram }} -{{- if .Values.traccar.telegram.key }} +{{- if .Values.traccar.notificator.telegram }} +{{- if .Values.traccar.notificator.telegram.key }} {{ .Values.traccar.notificator.telegram.key }} {{- end }} -{{- if .Values.traccar.telegram.chatId }} +{{- if .Values.traccar.notificator.telegram.chatId }} {{ .Values.traccar.notificator.telegram.chatId }} {{- end }} {{- end }} From 8e71827b2a5f4f16f54a84dba7471862baa32e8a Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:50:27 +0100 Subject: [PATCH 6/7] Updated version number --- charts/traccar/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/traccar/Chart.yaml b/charts/traccar/Chart.yaml index 002ce5b..00630fa 100644 --- 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.1.2 +version: 1.2.0 appVersion: "4.13" dependencies: - name: mysql From ba3b48f6c2ee271bb98e97e74ee3b823d2413aff Mon Sep 17 00:00:00 2001 From: Rick Lambrechts Date: Mon, 7 Nov 2022 15:56:48 +0100 Subject: [PATCH 7/7] Fix typo --- charts/traccar/templates/configmap.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml index d049690..69bf95c 100644 --- a/charts/traccar/templates/configmap.yaml +++ b/charts/traccar/templates/configmap.yaml @@ -371,13 +371,13 @@ data: {{- if .Values.traccar.notificator.types }} {{ .Values.traccar.notificator.types }} {{- end }} -{- if .Values.traccar.notificator.traccar }} -{- if .Values.traccar.notificator.traccar.key }} +{{- if .Values.traccar.notificator.traccar }} +{{- if .Values.traccar.notificator.traccar.key }} {{ .Values.traccar.notificator.traccar.key }} {{- end }} {{- end }} -{- if .Values.traccar.notificator.firebase }} -{- if .Values.traccar.notificator.firebase.serviceAccount }} +{{- if .Values.traccar.notificator.firebase }} +{{- if .Values.traccar.notificator.firebase.serviceAccount }} {{ .Values.traccar.notificator.firebase.serviceAccount }} {{- end }} {{- end }}