Merge branch 'master' into init-containers

Author: cfis

charts/docker-mailserver/templates/deployment.yaml

@@ -191,6 +191,8 @@ spec:
             - name: submission
               containerPort: 587
           {{- if .Values.proxyProtocol.enabled }}
+            - name: smtp-proxy
+              containerPort: 12525
             - name: subs-proxy
               containerPort: 10465
             - name: sub-proxy

charts/docker-mailserver/templates/service.yaml

@@ -55,6 +55,9 @@ spec:
       nodePort: {{ default "30587" .Values.service.nodePort.submission }}
       {{ end }}
   {{- if .Values.proxyProtocol.enabled }}
+    - name: smtp-proxy
+      targetPort: smtp-proxy
+      port: 12525
     - name: subs-proxy
       targetPort: subs-proxy
       port: 10465

charts/docker-mailserver/values.yaml

@@ -598,6 +598,12 @@ configMaps:
         -o milter_macro_daemon_name=ORIGINATING
         -o cleanup_service_name=sender-cleanup
         -o smtpd_upstream_proxy_protocol=haproxy
+
+      # Smtp with proxy
+      12525     inet  n       -       n       -       1       postscreen
+        -o syslog_name=postfix/smtp-proxy
+        -o postscreen_upstream_proxy_protocol=haproxy
+        -o postscreen_cache_map=btree:$data_directory/postscreen_10025_cache
       EOS
       {{- end }}