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

fix: correct variables for addresses

parent 13e9da18
No related branches found
No related tags found
No related merge requests found
Pipeline #2732 passed
Stage: lint-helm-chart
Stage: release-helm-chart
Show whitespace changes
Inline Side-by-side
templates/configmap-global.yaml
+ 27
− 24
View file @ b0c7ae31
...@@ -19,39 +19,17 @@ data: ...@@ -19,39 +19,17 @@ data:
DMARC_RUF: "{{ .Values.dmarc.ruf }}" DMARC_RUF: "{{ .Values.dmarc.ruf }}"
DOMAIN: "{{ .Values.config.domain }}" DOMAIN: "{{ .Values.config.domain }}"
FETCHMAIL_DELAY: "600" FETCHMAIL_DELAY: "600"
ADMIN_ADDRESS: "{{ include "mailu-helm.fullname" . }}-admin.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
FRONT_ADDRESS: "{{ include "mailu-helm.fullname" . }}-front.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOSTNAMES: "{{ join "," .Values.config.hostnames }}" HOSTNAMES: "{{ join "," .Values.config.hostnames }}"
HOST_ADMIN: "{{ include "mailu-helm.fullname" . }}-admin.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_ANTISPAM_MILTER: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:11332"
HOST_ANTISPAM_WEBUI: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:11334"
ANTISPAM_WEBUI_ADDRESS: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:11334"
HOST_ANTIVIRUS: "{{ include "mailu-helm.fullname" . }}-antivirus.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:3310"
HOST_AUTHSMTP: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
AUTHSMTP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_IMAP: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_POP3: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
POP3_ADDRESS: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_REDIS: "{{ .Values.redis.host }}"
HOST_SMTP: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
SMTP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_WEBDAV: "{{ include "mailu-helm.fullname" . }}-webdav.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:5232"
HOST_WEBMAIL: "{{ include "mailu-helm.fullname" . }}-webmail.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
IMAP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
LMTP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
WEBMAIL_ADDRESS: "{{ include "mailu-helm.fullname" . }}-webmail.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
WEBDAV_ADDRESS: "{{ include "mailu-helm.fullname" . }}-webmail.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:5232"
KUBERNETES_INGRESS: "true" KUBERNETES_INGRESS: "true"
MESSAGE_SIZE_LIMIT: "{{ .Values.config.messageSizeLimit }}" MESSAGE_SIZE_LIMIT: "{{ .Values.config.messageSizeLimit }}"
PASSWORD_SCHEME: "{{ .Values.config.passwordScheme }}" PASSWORD_SCHEME: "{{ .Values.config.passwordScheme }}"
POD_ADDRESS_RANGE: "{{ .Values.config.realIpFrom }}" POD_ADDRESS_RANGE: "{{ .Values.config.realIpFrom }}"
POSTMASTER: "{{ .Values.config.postmaster }}" POSTMASTER: "{{ .Values.config.postmaster }}"
#QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/1" QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/1"
#RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/2" RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/2"
REAL_IP_FROM: "{{ .Values.config.realIpFrom }}" REAL_IP_FROM: "{{ .Values.config.realIpFrom }}"
REAL_IP_HEADER: "{{ .Values.config.realIpHeader }}" REAL_IP_HEADER: "{{ .Values.config.realIpHeader }}"
RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}" RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}"
REDIS_ADDRESS: "{{ .Values.redis.host }}"
SITENAME: "{{ .Values.config.siteName }}" SITENAME: "{{ .Values.config.siteName }}"
SUBNET: "{{ .Values.config.subnet }}" SUBNET: "{{ .Values.config.subnet }}"
SUBNET_ADMIN: "{{ .Values.admin.subnet }}" SUBNET_ADMIN: "{{ .Values.admin.subnet }}"
...@@ -65,3 +43,28 @@ data: ...@@ -65,3 +43,28 @@ data:
WELCOME: "{{ .Values.welcome.enabled }}" WELCOME: "{{ .Values.welcome.enabled }}"
WELCOME_SUBJECT: "{{ .Values.welcome.subject }}" WELCOME_SUBJECT: "{{ .Values.welcome.subject }}"
WELCOME_BODY: "{{ .Values.welcome.body }}" WELCOME_BODY: "{{ .Values.welcome.body }}"
HOST_ADMIN: "{{ include "mailu-helm.fullname" . }}-admin.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
ADMIN_ADDRESS: "{{ include "mailu-helm.fullname" . }}-admin.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
FRONT_ADDRESS: "{{ include "mailu-helm.fullname" . }}-front.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_ANTISPAM_MILTER: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
ANTISPAM_MILTER_ADDRESS: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:11332"
HOST_ANTISPAM_WEBUI: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
ANTISPAM_WEBUI_ADDRESS: "{{ include "mailu-helm.fullname" . }}-antispam.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:11334"
HOST_ANTIVIRUS: "{{ include "mailu-helm.fullname" . }}-antivirus.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
ADDRESS_ANTIVIRUS: "{{ include "mailu-helm.fullname" . }}-antivirus.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:3310"
HOST_AUTHSMTP: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
AUTHSMTP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_IMAP: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
IMAP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
LMTP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:2525"
HOST_POP3: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
POP3_ADDRESS: "{{ include "mailu-helm.fullname" . }}-imap.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_REDIS: "{{ .Values.redis.host }}"
REDIS_ADDRESS: "{{ .Values.redis.host }}"
HOST_SMTP: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
SMTP_ADDRESS: "{{ include "mailu-helm.fullname" . }}-smtp.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
HOST_WEBDAV: "{{ include "mailu-helm.fullname" . }}-webdav.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:5232"
WEBDAV_ADDRESS: "{{ include "mailu-helm.fullname" . }}-webmail.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}:5232"
HOST_WEBMAIL: "{{ include "mailu-helm.fullname" . }}-webmail.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
WEBMAIL_ADDRESS: "{{ include "mailu-helm.fullname" . }}-webmail.{{.Release.Namespace}}.svc.{{.Values.clusterSuffix}}"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment