Skip to content
Snippets Groups Projects
Verified Commit 6a69f7e5 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

fix: correct issues with subnets

parent 8695a4b0
No related branches found
No related tags found
No related merge requests found
Pipeline #2751 passed
...@@ -30,7 +30,7 @@ data: ...@@ -30,7 +30,7 @@ data:
RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}" RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}"
SITENAME: "{{ .Values.config.siteName }}" SITENAME: "{{ .Values.config.siteName }}"
SUBNET: "{{ .Values.config.subnet }}" SUBNET: "{{ .Values.config.subnet }}"
SUBNET_ADMIN: "{{ .Values.admin.subnet }}" SUBNET_EXTERNAL: "{{ .Values.config.subnet_external }}"
TLS_FLAVOR: "mail" TLS_FLAVOR: "mail"
VERSION: "{{ .Values.image.tag | default .Chart.AppVersion }}" VERSION: "{{ .Values.image.tag | default .Chart.AppVersion }}"
WEBDAV: "radicale" WEBDAV: "radicale"
......
...@@ -27,8 +27,8 @@ data: ...@@ -27,8 +27,8 @@ data:
smtpd_tls_ciphers = high smtpd_tls_ciphers = high
smtpd_tls_mandatory_ciphers = high smtpd_tls_mandatory_ciphers = high
# Relayed networks # Relayed networks
mynetworks=127.0.0.1/32 [::1]/128 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=10.244.0.0/16 116.202.227.171/32 smtpd_authorized_xclient_hosts={{ .Values.config.subnet }} {{ .Values.config.subnet_external }}/32
postscreen_upstream_proxy_protocol = haproxy postscreen_upstream_proxy_protocol = haproxy
postscreen_upstream_proxy_protocol = haproxy postscreen_upstream_proxy_protocol = haproxy
......
...@@ -49,11 +49,10 @@ spec: ...@@ -49,11 +49,10 @@ spec:
name: {{ include "mailu-helm.fullname" . }} name: {{ include "mailu-helm.fullname" . }}
env: env:
- name: SUBNET - name: SUBNET
value: 116.202.227.171 valueFrom:
#valueFrom: configMapKeyRef:
# configMapKeyRef: name: {{ include "mailu-helm.fullname" . }}
# name: {{ include "mailu-helm.fullname" . }} key: SUBNET_EXTERNAL
# key: SUBNET_ADMIN
ports: ports:
- name: "http" - name: "http"
containerPort: 80 containerPort: 80
......
...@@ -21,6 +21,7 @@ config: ...@@ -21,6 +21,7 @@ config:
recipientDelimiter: "+" recipientDelimiter: "+"
siteName: "Example.com Mail" siteName: "Example.com Mail"
subnet: "10.42.0.0/16" subnet: "10.42.0.0/16"
subnet_external: "1.2.3.4"
welcome: welcome:
enabled: false enabled: false
...@@ -75,7 +76,6 @@ admin: ...@@ -75,7 +76,6 @@ admin:
enabled: true enabled: true
host: "mail.example.com" host: "mail.example.com"
path: "/admin" path: "/admin"
subnet: "10.42.0.0/16"
resources: resources:
limits: limits:
cpu: 500m cpu: 500m
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment