docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Removed RSPAMD Password feature

Browse Source 
- Updated roles on the Front DS
- Reverted the Auth limits

Signed-off-by: Hans Cornelis <hacornelis@gmail.com>
This commit is contained in:
Hans Cornelis
2018-10-19 13:39:32 +02:00
parent ef55ca525c
commit 6fb0b93240
4 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/compose/.env
View File

@@ -55,9 +55,6 @@ WEBDAV=none
# Antivirus solution (value: clamav, none) # Antivirus solution (value: clamav, none)
ANTIVIRUS=none ANTIVIRUS=none
# The password for the rspamd web interface
RSPAMD_PASSWORD=Secr3tPassWord
################################### ###################################
# Mail settings # Mail settings
################################### ###################################

11
docs/kubernetes/mailu/configmap.yaml
View File

@@ -40,7 +40,7 @@
TLS_FLAVOR: "cert" TLS_FLAVOR: "cert"
# Authentication rate limit (per source IP address) # 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 # Opt-out of statistics, replace with "True" to opt out
DISABLE_STATISTICS: "False" DISABLE_STATISTICS: "False"
@@ -52,7 +52,6 @@
# Use Kubernetes Ingress Controller to handle all actions on port 80 and 443 # 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 # This way we can make use of the advantages of the cert-manager deployment
KUBERNETES_INGRESS: "true" KUBERNETES_INGRESS: "true"
POD_ADDRESS_RANGE: "10.2.0.0/16"
################################### ###################################
# Optional features # Optional features
@@ -72,9 +71,6 @@
# Antivirus solution (value: clamav, none) # Antivirus solution (value: clamav, none)
ANTIVIRUS: "clamav" ANTIVIRUS: "clamav"
# The password for the rspamd web interface
RSPAMD_PASSWORD: "Secr3tPassWord"
################################### ###################################
# Mail settings # Mail settings
################################### ###################################
@@ -83,11 +79,6 @@
# Default: accept messages up to 50MB # Default: accept messages up to 50MB
MESSAGE_SIZE_LIMIT: "50000000" 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 # Will relay all outgoing mails if configured
#RELAYHOST= #RELAYHOST=

4
docs/kubernetes/mailu/front.yaml
View File

@@ -25,8 +25,8 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/node
operator: DoesNotExist operator: Exists
hostNetwork: true hostNetwork: true
nodeSelector: nodeSelector:
node-role.kubernetes.io/node: "" node-role.kubernetes.io/node: ""

4
services/rspamd/conf/worker-controller.inc
View File

@@ -1,7 +1,3 @@
bind_socket = "*:11334"; bind_socket = "*:11334";
{% if RSPAMD_PASSWORD %}
password = "{{ RSPAMD_PASSWORD }}";
{% else %}
password = "mailu"; password = "mailu";
{% endif %}
secure_ip = "{{ FRONT_ADDRESS }}"; secure_ip = "{{ FRONT_ADDRESS }}";