fix: correct issues with subnets

templates/configmap-global.yaml

@@ -30,7 +30,7 @@ data:
   RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}"
   SITENAME: "{{ .Values.config.siteName }}"
   SUBNET: "{{ .Values.config.subnet }}"
-  SUBNET_ADMIN: "{{ .Values.admin.subnet }}"
+  SUBNET_EXTERNAL: "{{ .Values.config.subnet_external }}"
   TLS_FLAVOR: "mail"
   VERSION: "{{ .Values.image.tag | default .Chart.AppVersion }}"
   WEBDAV: "radicale"

templates/configmap-smtp.yaml

@@ -27,8 +27,8 @@ data:
     smtpd_tls_ciphers = high
     smtpd_tls_mandatory_ciphers = high
     # Relayed networks
-    mynetworks=127.0.0.1/32 [::1]/128 10.244.0.0/16 116.202.227.171/32
-    smtpd_authorized_xclient_hosts=10.244.0.0/16 116.202.227.171/32
+    mynetworks=127.0.0.1/32 [::1]/128 {{ .Values.config.subnet }} {{ .Values.config.subnet_external }}/32
+    smtpd_authorized_xclient_hosts={{ .Values.config.subnet }} {{ .Values.config.subnet_external }}/32
 
     postscreen_upstream_proxy_protocol = haproxy
     postscreen_upstream_proxy_protocol = haproxy

templates/deploy-admin.yaml

@@ -49,11 +49,10 @@ spec:
                 name: {{ include "mailu-helm.fullname" . }}
           env:
             - name: SUBNET
-              value: 116.202.227.171
-              #valueFrom:
-              #  configMapKeyRef:
-              #    name: {{ include "mailu-helm.fullname" . }}
-              #    key: SUBNET_ADMIN
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ include "mailu-helm.fullname" . }}
+                  key: SUBNET_EXTERNAL
           ports:
             - name: "http"
               containerPort: 80

values.yaml

@@ -21,6 +21,7 @@ config:
   recipientDelimiter: "+"
   siteName: "Example.com Mail"
   subnet: "10.42.0.0/16"
+  subnet_external: "1.2.3.4"
 
 welcome:
   enabled: false
@@ -75,7 +76,6 @@ admin:
   enabled: true
   host: "mail.example.com"
   path: "/admin"
-  subnet: "10.42.0.0/16"
   resources:
     limits:
       cpu: 500m