diff --git a/templates/configmap-global.yaml b/templates/configmap-global.yaml index 4c4803d226067c5d341ccace572e686fb92f6640..76ba6e94ab6d993b0a1e010de06e94ad38dc5abd 100644 --- a/templates/configmap-global.yaml +++ b/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" diff --git a/templates/configmap-smtp.yaml b/templates/configmap-smtp.yaml index 0689d93b0374c41b06456ee615ff964e69e488e0..fc35d02c62219831918142751d74cf316d7515f8 100644 --- a/templates/configmap-smtp.yaml +++ b/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 diff --git a/templates/deploy-admin.yaml b/templates/deploy-admin.yaml index 538e466b30870a7fa8345ad3dcd4bdc3ffa29cf5..5708112fe753ab9d0fd1950634b3d0e860ae19c2 100644 --- a/templates/deploy-admin.yaml +++ b/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 diff --git a/values.yaml b/values.yaml index 9082169c928f67d6f18fd910c998b45de5f9c619..4d77aa04ffef885fdd33062ff9f0f136f07390bf 100644 --- a/values.yaml +++ b/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