diff --git a/templates/deploy-antispam.yaml b/templates/deploy-antispam.yaml index eb168b07b063b86b8faf0cd903148fc3409e7f06..e5b4cafe94e8c78e237b82dee3cac36145bb5d0a 100644 --- a/templates/deploy-antispam.yaml +++ b/templates/deploy-antispam.yaml @@ -32,9 +32,6 @@ spec: {{- .Values.volumes.filter | nindent 10 }} - name: dkim {{- .Values.volumes.dkim | nindent 10 }} - - name: config - secret: - secretName: {{ include "mailu-helm.fullname" . }}-antispam - name: local-config emptyDir: {} containers: @@ -62,9 +59,6 @@ spec: mountPath: "/var/lib/rspamd" - name: dkim mountPath: "/dkim" - - name: config - subPath: "worker-controller.inc" - mountPath: "/etc/rspamd/override.d/worker-controller.inc" - name: local-config mountPath: "/etc/rspamd/local.d" startupProbe: diff --git a/templates/ingress-admin.yaml b/templates/ingress-admin.yaml index a042915fc26022db6d64cdc9908593d53b309d1b..c3c7a185bf3df8c0743516a3af4fcfbd80e8ecfb 100644 --- a/templates/ingress-admin.yaml +++ b/templates/ingress-admin.yaml @@ -19,7 +19,7 @@ metadata: } spec: rules: - - host: "{{ .Values.admin.hostname }}" + - host: "{{ .Values.admin.host }}" http: paths: - path: "{{ .Values.admin.path }}" diff --git a/templates/ingress-antispam.yaml b/templates/ingress-antispam.yaml index 8ec1771296d02f160947780386a2276aaaa6c6f1..86cf40316c389a63b1bac28f50a442b857395fa0 100644 --- a/templates/ingress-antispam.yaml +++ b/templates/ingress-antispam.yaml @@ -13,9 +13,10 @@ metadata: nginx.ingress.kubernetes.io/configuration-snippet: | proxy_set_header X-Real-IP ""; proxy_set_header X-Forwarded-For ""; + proxy_set_header Password "mailu"; spec: rules: - - host: "{{ .Values.admin.hostname }}" + - host: "{{ .Values.admin.host }}" http: paths: - path: "{{ .Values.admin.path }}/antispam($|/)(/.*)" diff --git a/templates/ingress-webdav.yaml b/templates/ingress-webdav.yaml index 6b8475acb0691eb1d95e5d1baae1433c40fa52d3..14f6f687173ed81fbd739c82de4fbfb50b157357 100644 --- a/templates/ingress-webdav.yaml +++ b/templates/ingress-webdav.yaml @@ -18,7 +18,7 @@ metadata: nginx.ingress.kubernetes.io/rewrite-target: /$2 spec: rules: - - host: "{{ .Values.admin.hostname }}" + - host: "{{ .Values.webdav.host }}" http: paths: - path: "{{ .Values.webdav.path }}(/|$)(.*)" diff --git a/templates/secret-antispam.yaml b/templates/secret-antispam.yaml deleted file mode 100644 index 9bed64c20f9c8d1ff42366fbca092f9fa457f299..0000000000000000000000000000000000000000 --- a/templates/secret-antispam.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "mailu-helm.fullname" . }}-antispam - labels: - {{- include "mailu-helm.labels" . | nindent 4 }} - component: antispam -stringData: - "worker-controller.inc": |- - password = "{{ .Values.antispam.password }}"