revert unrelated changes

Author: MichaelSp

charts/docker-mailserver/templates/deployment.yaml

@@ -57,10 +57,10 @@ spec:
       {{- end }}
 
         # Secrets
-      {{- range .Values.secrets }}
-        - name: {{ regexReplaceAll "[.]" .name "-" }}
+      {{- range $name, $secret := .Values.secrets }}
+        - name: {{ regexReplaceAll "[.]" $name "-" }}
           secret:
-            secretName: {{ regexReplaceAll "[.]" .name "-" }}
+            secretName: {{ regexReplaceAll "[.]" $name "-" }}
       {{- end }}
 
         # Certificate
@@ -144,13 +144,13 @@ spec:
         {{- end }}
 
             # Config via Secrets
-        {{- range .Values.secrets }}
-            - name: {{ regexReplaceAll "[.]" .name "-" }}
-              subPath: {{ .key | default .name }}
-            {{- if isAbs .path }}
-              mountPath: {{ $.path }}
+        {{- range $name, $secret := .Values.secrets }}
+            - name: {{ regexReplaceAll "[.]" $name "-" }}
+              subPath: {{ $secret.key | default $name }}
+            {{- if isAbs $secret.path }}
+              mountPath: {{ $secret.path }}
             {{- else }}
-              mountPath: /tmp/docker-mailserver/{{ .path }}
+              mountPath: /tmp/docker-mailserver/{{ $secret.path }}
             {{- end }}
         {{- end }}
 

charts/docker-mailserver/values.yaml

@@ -76,8 +76,8 @@ deployment:
     # --- General Section ---------------------------
     # -----------------------------------------------
     LOG_LEVEL: info
-    SUPERVISOR_LOGLEVEL: 
-    DMS_VMAIL_UID: 
+    SUPERVISOR_LOGLEVEL:
+    DMS_VMAIL_UID:
     DMS_VMAIL_GID: 
     ACCOUNT_PROVISIONER: 
     POSTMASTER_ADDRESS: 
@@ -611,17 +611,15 @@ configMaps:
 ## such as DKIM signing keys.
 ##
 ##  secrets:
-##    rspamd.example.com:
-##      name: rspamd.example.com                      # This is the name of the Secret
-##      create: true                                  # If true, create a new Secret
-##      path: rspamd.dkim.rsa-2048-mail-example.com.private.txt
-##      data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
+##  - name: rspamd.example.com                      # This is the name of the Secret
+##    create: true                                  # If true, create a new Secret
+##    path: rspamd.dkim.rsa-2048-mail-example.com.private.txt
+##    data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
 ##
-##    rspamd.dkim.rsa-2048-mail-example.com.public:
-##      name: rspamd.dkim.rsa-2048-mail-example.com.public
-##      create: true
-##      path: rspamd/dkim/rsa-2048-mail-example.com.public
-##      data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
+##  - name: rspamd.dkim.rsa-2048-mail-example.com.public
+##    create: true
+##    path: rspamd/dkim/rsa-2048-mail-example.com.public
+##    data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
 ##
 ##  If you set the create key to false, then you must manually create the ConfigMaps before deploying the chart.
 ##