Merge remote-tracking branch 'origin/fix/postfix/service-name'

charts/mok/Chart.yaml

@@ -3,7 +3,7 @@ name: mok
 description: |
   Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 type: application
-version: 0.1.2
+version: 0.1.3
 sources:
   - https://de.postfix.org/ftpmirror/index.html
   - https://github.com/dovecot/core

charts/mok/README.md

 # mok
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 
@@ -55,7 +55,7 @@ Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that run
 | postfix.affinity | object | `{}` |  |
 | postfix.image.pullPolicy | string | `"IfNotPresent"` |  |
 | postfix.image.repository | string | `"quay.io/shivering-isles/postfix"` | postfix container image |
-| postfix.image.tag | string | `"0.1.0"` | Overrides the image tag whose default is "latest" |
+| postfix.image.tag | string | `"0.1.1"` | Overrides the image tag whose default is "latest" |
 | postfix.imagePullSecrets | list | `[]` |  |
 | postfix.nodeSelector | object | `{}` |  |
 | postfix.podAnnotations | object | `{}` |  |

charts/mok/templates/postfix.yaml

@@ -66,6 +66,9 @@ spec:
         {{- toYaml .Values.postfix.podSecurityContext | nindent 8 }}
       containers:
         - name: postfix
+          env:
+            - name: DOVECOT_SERVICE_NAME
+              value: {{ include "mok.fullname" . }}-dovecot-internal.{{ .Release.Namespace }}.svc.cluster.local
           image: {{ .Values.postfix.image.repository }}:{{.Values.postfix.image.tag | default "latest" }}
           imagePullPolicy: {{ .Values.postfix.image.pullPolicy }}
           lifecycle:

charts/mok/values.yaml

@@ -44,7 +44,7 @@ postfix:
     repository: quay.io/shivering-isles/postfix
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is "latest"
-    tag: "0.1.0"
+    tag: "0.1.1"
 
   imagePullSecrets: []
 

images/postfix/.gitlab-ci.yaml

@@ -26,7 +26,7 @@ postfix-container-build-dev:
     - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-      cd images/dovecot
+      cd images/postfix
       podman build --pull \
       --label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/postfix" \
       --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" \

images/postfix/.release

-release=0.1.0
+release=0.1.1

images/postfix/config/master.cf

@@ -111,10 +111,6 @@ submission inet  n       -       y       -       -       smtpd
     -o syslog_name=postfix/submission
     -o smtpd_tls_security_level=encrypt
     -o tls_preempt_cipherlist=yes
-    -o smtpd_sasl_type=dovecot
-    -o smtpd_sasl_path=inet:dovecot-internal:12345
-    -o smtpd_sasl_security_options=noanonymous
-    -o smtpd_sasl_auth_enable=yes
     -o smtpd_client_restrictions=permit_sasl_authenticated,reject
     -o smtpd_sender_login_maps=lmdb:/srv/tmp/sender-login-maps
     -o cleanup_service_name=headers-cleanup
@@ -124,10 +120,6 @@ submissions inet  n       -       y       -       -       smtpd
     -o smtpd_tls_wrappermode=yes
     -o smtpd_tls_security_level=encrypt
     -o tls_preempt_cipherlist=yes
-    -o smtpd_sasl_type=dovecot
-    -o smtpd_sasl_path=inet:dovecot-internal:12345
-    -o smtpd_sasl_security_options=noanonymous
-    -o smtpd_sasl_auth_enable=yes
     -o smtpd_client_restrictions=permit_sasl_authenticated,reject
     -o smtpd_sender_login_maps=lmdb:/srv/tmp/sender-login-maps
     -o cleanup_service_name=headers-cleanup

images/postfix/docker/start.sh

@@ -37,6 +37,10 @@ fi
 ##
 
 postconf -e "myhostname = $HOSTNAME"
+if [ -n DOVECOT_SERVICE_NAME ]; then
+  postconf -e "smtpd_sasl_path = inet:${DOVECOT_SERVICE_NAME}:12345"
+  postconf -e "virtual_transport = lmtp:inet:${DOVECOT_SERVICE_NAME}:24"
+fi
 cp /srv/virtual/* /srv/tmp
 find /srv/tmp -type f -exec postmap lmdb://{} \;
 
@@ -45,6 +49,7 @@ find /srv/tmp -type f -exec postmap lmdb://{} \;
 ## Kube DNS Support
 ##
 
+mkdir -p /var/spool/postfix/etc/
 cp /etc/resolv.conf /var/spool/postfix/etc/
 
 ########