Merge pull request #10 from abh/no-haproxy

Include dovecot config even if haproxy is disabled

Author: funkypenguin

charts/docker-mailserver/templates/configmap.yaml

@@ -37,17 +37,18 @@ 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 -}}
-  {{ if .Values.haproxy.enabled -}}  
-  dovecot.cf: |   
+  dovecot.cf: |
+  {{- if .Values.haproxy.enabled }}
     haproxy_trusted_networks = {{ .Values.haproxy.trustedNetworks }}
+  {{ end }}
     service imap-login {
       inet_listener imap {
-        haproxy = yes
+        {{ if .Values.haproxy.enabled -}}haproxy = yes{{ end }}
       }  
       inet_listener imaps {
-        haproxy = yes
+        {{ if .Values.haproxy.enabled -}}haproxy = yes{{ end }}
       }
-    {{ if .Values.rainloop.enabled -}}  
+    {{- if .Values.rainloop.enabled }}
       inet_listener imaps-rainloop {
         port = 10993
         ssl = yes
@@ -56,13 +57,14 @@ data:
     }    
     service pop3-login {
       inet_listener pop3 {
-        haproxy = yes
+        {{ if .Values.haproxy.enabled -}}haproxy = yes{{ end }}
       }
       inet_listener pop3s {
-        haproxy = yes
+        {{ if .Values.haproxy.enabled -}}haproxy = yes{{ end }}
       }                        
     }
 
+
   80-replication.conf: |
     mail_plugins = $mail_plugins notify replication
 
@@ -94,7 +96,7 @@ data:
     }
 
     plugin {
-      mail_replica = tcp:anotherhost.example.com # use doveadm_port
+      #mail_replica = tcp:anotherhost.example.com       # use doveadm_port
       #mail_replica = tcp:anotherhost.example.com:12345 # use port 12345 explicitly
     }
 
@@ -104,7 +106,6 @@ data:
       sieve_dir = /var/mail/sieve/%d/%n/sieve
     }
 
-  {{ end -}}
   am-i-healthy.sh: |
     #!/bin/bash
     # this script is intended to be used by periodic kubernetes liveness probes to ensure that the container