scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-31 10:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove POD_ADDRESS_RANGE

Browse Source
This commit is contained in:
Vincent Kling
2022-09-01 15:08:26 +02:00
parent 56d0e795eb
commit bab3f0f5a4
7 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/admin/mailu/configuration.py
View File

@@ -87,8 +87,7 @@ DEFAULT_CONFIG = {
'HOST_REDIS': 'redis', 'HOST_REDIS': 'redis',
'HOST_FRONT': 'front', 'HOST_FRONT': 'front',
'SUBNET': '192.168.203.0/24', 'SUBNET': '192.168.203.0/24',
'SUBNET6': None, 'SUBNET6': None
'POD_ADDRESS_RANGE': None
} }
class ConfigManager: class ConfigManager:

2
core/admin/mailu/internal/views/dovecot.py
View File

@@ -13,8 +13,6 @@ def dovecot_passdb_dict(user_email):
allow_nets.append(app.config["SUBNET"]) allow_nets.append(app.config["SUBNET"])
if app.config["SUBNET6"]: if app.config["SUBNET6"]:
allow_nets.append(app.config["SUBNET6"]) allow_nets.append(app.config["SUBNET6"])
if app.config["POD_ADDRESS_RANGE"]:
allow_nets.append(app.config["POD_ADDRESS_RANGE"])
return flask.jsonify({ return flask.jsonify({
"password": None, "password": None,
"nopassword": "Y", "nopassword": "Y",

2
core/postfix/conf/main.cf
View File

@@ -39,7 +39,7 @@ recipient_delimiter = {{ RECIPIENT_DELIMITER }}
# Only the front server is allowed to perform xclient # Only the front server is allowed to perform xclient
# In kubernetes and Docker swarm, such address cannot be determined using the hostname. Allow for the whole Mailu subnet instead. # In kubernetes and Docker swarm, such address cannot be determined using the hostname. Allow for the whole Mailu subnet instead.
smtpd_authorized_xclient_hosts={{ POD_ADDRESS_RANGE or SUBNET }} smtpd_authorized_xclient_hosts={{ SUBNET }}
############### ###############
# TLS # TLS

2
core/rspamd/conf/worker-controller.inc
View File

@@ -1,4 +1,4 @@
type = "controller"; type = "controller";
bind_socket = "*:11334"; bind_socket = "*:11334";
password = "mailu"; password = "mailu";
secure_ip = "{{ POD_ADDRESS_RANGE or SUBNET }}"; secure_ip = "{{ SUBNET }}";

16
docs/swarm/master/README.md
View File

@@ -75,7 +75,7 @@ On this example, we are using:
- the default ingress mode. - the default ingress mode.
### Allow authentification with the mesh routing ### Allow authentification with the mesh routing
In order to allow every (front & webmail) container to access the other services, we will use the variable POD_ADDRESS_RANGE. In order to allow every (front & webmail) container to access the other services, we will use the variable SUBNET.
Let's create the mailu_default network: Let's create the mailu_default network:
```bash ```bash
@@ -83,8 +83,8 @@ core@coreos-01 ~ $ docker network create -d overlay --attachable mailu_default
core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet
"Subnet": "10.0.1.0/24", "Subnet": "10.0.1.0/24",
``` ```
In the docker-compose.yml file, we will then use POD_ADDRESS_RANGE = 10.0.1.0/24 In the docker-compose.yml file, we will then use SUBNET = 10.0.1.0/24
In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of "mailu_default-endpoint". So it is sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation... In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of "mailu_default-endpoint". So it is sufficient to set SUBNET to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation...
### Limitation with the ingress mode ### Limitation with the ingress mode
With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network) With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network)
@@ -106,7 +106,7 @@ When using ingress mode you probably want to disable rate limits, because all re
## Scalability ## Scalability
- smtp and imap are scalable - smtp and imap are scalable
- front and webmail are scalable (pending POD_ADDRESS_RANGE is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time) - front and webmail are scalable (pending SUBNET is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time)
- redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file) - redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
## Docker secrets ## Docker secrets
@@ -121,7 +121,7 @@ Instead, we will use the following work-around:
We need also to: We need also to:
- add a deploy section for every service - add a deploy section for every service
- modify the way the ports are defined for the front service - modify the way the ports are defined for the front service
- add the POD_ADDRESS_RANGE definition for admin (for imap), smtp and antispam services - add the SUBNET definition for admin (for imap), smtp and antispam services
## Docker compose ## Docker compose
An example of docker-compose-stack.yml file is available here: An example of docker-compose-stack.yml file is available here:
@@ -185,7 +185,7 @@ services:
restart: always restart: always
env_file: .env env_file: .env
environment: environment:
- POD_ADDRESS_RANGE=10.0.1.0/24 - SUBNET=10.0.1.0/24
volumes: volumes:
- "$ROOT/overrides:/overrides" - "$ROOT/overrides:/overrides"
depends_on: depends_on:
@@ -198,7 +198,7 @@ services:
restart: always restart: always
env_file: .env env_file: .env
environment: environment:
- POD_ADDRESS_RANGE=10.0.1.0/24 - SUBNET=10.0.1.0/24
volumes: volumes:
- "$ROOT/filter:/var/lib/rspamd" - "$ROOT/filter:/var/lib/rspamd"
- "$ROOT/dkim:/dkim" - "$ROOT/dkim:/dkim"
@@ -231,7 +231,7 @@ services:
restart: always restart: always
env_file: .env env_file: .env
environment: environment:
- POD_ADDRESS_RANGE=10.0.1.0/24 - SUBNET=10.0.1.0/24
volumes: volumes:
- "$ROOT/data:/data" - "$ROOT/data:/data"
- "$ROOT/dkim:/dkim" - "$ROOT/dkim:/dkim"

14
docs/swarm/master/README_nfs_example.md
View File

@@ -62,7 +62,7 @@ On this example, we are using:
- the default ingress mode. - the default ingress mode.
### Allow authentification with the mesh routing ### Allow authentification with the mesh routing
In order to allow every (front & webmail) container to access the other services, we will use the variable POD_ADDRESS_RANGE. In order to allow every (front & webmail) container to access the other services, we will use the variable SUBNET.
Let's create the mailu_default network: Let's create the mailu_default network:
```bash ```bash
@@ -70,8 +70,8 @@ core@coreos-01 ~ $ docker network create -d overlay --attachable mailu_default
core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet
"Subnet": "10.0.1.0/24", "Subnet": "10.0.1.0/24",
``` ```
In the docker-compose.yml file, we will then use POD_ADDRESS_RANGE = 10.0.1.0/24 In the docker-compose.yml file, we will then use SUBNET = 10.0.1.0/24
In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of "mailu_default-endpoint". So it is sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation... In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of "mailu_default-endpoint". So it is sufficient to set SUBNET to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation...
### Limitation with the ingress mode ### Limitation with the ingress mode
With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network) With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network)
@@ -90,7 +90,7 @@ As a side effect of this ingress mode "feature", make sure that the ingress subn
## Scalability ## Scalability
- smtp and imap are scalable - smtp and imap are scalable
- front and webmail are scalable (pending POD_ADDRESS_RANGE is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time) - front and webmail are scalable (pending SUBNET is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time)
- redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file) - redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
## Variable substitution and docker-compose.yml ## Variable substitution and docker-compose.yml
@@ -176,7 +176,7 @@ services:
restart: always restart: always
env_file: .env env_file: .env
environment: environment:
- POD_ADDRESS_RANGE=10.0.1.0/24 - SUBNET=10.0.1.0/24
volumes: volumes:
# - "$ROOT/overrides:/overrides" # - "$ROOT/overrides:/overrides"
- type: volume - type: volume
@@ -192,7 +192,7 @@ services:
restart: always restart: always
env_file: .env env_file: .env
environment: environment:
- POD_ADDRESS_RANGE=10.0.1.0/24 - SUBNET=10.0.1.0/24
depends_on: depends_on:
- front - front
volumes: volumes:
@@ -240,7 +240,7 @@ services:
restart: always restart: always
env_file: .env env_file: .env
environment: environment:
- POD_ADDRESS_RANGE=10.0.1.0/24 - SUBNET=10.0.1.0/24
volumes: volumes:
# - "$ROOT/data:/data" # - "$ROOT/data:/data"
- type: volume - type: volume

1
towncrier/newsfragments/1258.removal Normal file
View File

@@ -0,0 +1 @@
Remove POD_ADDRESS_RANGE in favor of SUBNET