Merge pull request docker-mailserver#19 from bklang/deconflict_doveco…

…t_cf Rename dovecot.cf to dovecot-services.cf
sysfivecom · May 7, 2020 · 7552397 · 7552397
2 parents d13448d + db4c144
commit 7552397
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/charts/docker-mailserver/templates/configmap.yaml b/charts/docker-mailserver/templates/configmap.yaml
@@ -37,7 +37,7 @@ data:
   {{ if .Values.spfTestsDisabled }}
     smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, reject_unauth_pipelining, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org, reject_rbl_client bl.spamcop.net
   {{ end -}}
-  dovecot.cf: |
+  dovecot-services.cf: |
   {{- if .Values.haproxy.enabled }}
     haproxy_trusted_networks = {{ .Values.haproxy.trustedNetworks }}
   {{ end }}
@@ -114,4 +114,4 @@ data:
     {{ . }} && \
     {{- end }}
     echo "All healthy"
-{{- end -}}
+{{- end -}}
diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
@@ -87,6 +87,10 @@ spec:
             - name: data
               mountPath: /var/mail-state
               subPath: mail-state
+            - name: configmap
+              subPath: dovecot-services.cf
+              mountPath: /etc/dovecot/conf.d/services.cf
+              readOnly: true  
             - name: configmap
               subPath: dovecot.cf
               mountPath: /etc/dovecot/conf.d/zz-custom.cf