From cb76d095a6fdce8eda905c3b84165335e9e04cca Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 30 Apr 2022 22:36:06 +0200
Subject: [PATCH] fix: correct issues with antispam
---
templates/deploy-antispam.yaml | 6 ------
templates/ingress-admin.yaml | 2 +-
templates/ingress-antispam.yaml | 3 ++-
templates/ingress-webdav.yaml | 2 +-
templates/secret-antispam.yaml | 10 ----------
5 files changed, 4 insertions(+), 19 deletions(-)
delete mode 100644 templates/secret-antispam.yaml
diff --git a/templates/deploy-antispam.yaml b/templates/deploy-antispam.yaml
index eb168b0..e5b4caf 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 a042915..c3c7a18 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 8ec1771..86cf403 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 6b8475a..14f6f68 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 9bed64c..0000000
--- 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 }}"
--
GitLab