diff --git a/docs/compose/.env b/docs/compose/.env index 64981db2..7823bc3e 100644 --- a/docs/compose/.env +++ b/docs/compose/.env @@ -55,9 +55,6 @@ WEBDAV=none # Antivirus solution (value: clamav, none) ANTIVIRUS=none -# The password for the rspamd web interface -RSPAMD_PASSWORD=Secr3tPassWord - ################################### # Mail settings ################################### diff --git a/docs/kubernetes/mailu/configmap.yaml b/docs/kubernetes/mailu/configmap.yaml index be39fcc9..4f8dad81 100644 --- a/docs/kubernetes/mailu/configmap.yaml +++ b/docs/kubernetes/mailu/configmap.yaml @@ -40,7 +40,7 @@ TLS_FLAVOR: "cert" # Authentication rate limit (per source IP address) - AUTH_RATELIMIT: "100/minute;10000/hour" + AUTH_RATELIMIT: "10/minute;1000/hour" # Opt-out of statistics, replace with "True" to opt out DISABLE_STATISTICS: "False" @@ -52,7 +52,6 @@ # Use Kubernetes Ingress Controller to handle all actions on port 80 and 443 # This way we can make use of the advantages of the cert-manager deployment KUBERNETES_INGRESS: "true" - POD_ADDRESS_RANGE: "10.2.0.0/16" ################################### # Optional features @@ -72,9 +71,6 @@ # Antivirus solution (value: clamav, none) ANTIVIRUS: "clamav" - # The password for the rspamd web interface - RSPAMD_PASSWORD: "Secr3tPassWord" - ################################### # Mail settings ################################### @@ -83,11 +79,6 @@ # Default: accept messages up to 50MB MESSAGE_SIZE_LIMIT: "50000000" - # Networks granted relay permissions, make sure that you include your Docker - # internal network (default to 172.17.0.0/16) - # For kubernetes this is the CIDR of the pod network - RELAYNETS: "10.2.0.0/16" - # Will relay all outgoing mails if configured #RELAYHOST= diff --git a/docs/kubernetes/mailu/front.yaml b/docs/kubernetes/mailu/front.yaml index c13ecd9d..9951f30c 100644 --- a/docs/kubernetes/mailu/front.yaml +++ b/docs/kubernetes/mailu/front.yaml @@ -25,8 +25,8 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: node-role.kubernetes.io/master - operator: DoesNotExist + - key: node-role.kubernetes.io/node + operator: Exists hostNetwork: true nodeSelector: node-role.kubernetes.io/node: "" diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc index d3ab55f4..6a020672 100644 --- a/services/rspamd/conf/worker-controller.inc +++ b/services/rspamd/conf/worker-controller.inc @@ -1,7 +1,3 @@ bind_socket = "*:11334"; -{% if RSPAMD_PASSWORD %} -password = "{{ RSPAMD_PASSWORD }}"; -{% else %} password = "mailu"; -{% endif %} secure_ip = "{{ FRONT_ADDRESS }}";