Refactored application variables

This commit is contained in:
2025-02-03 11:44:13 +01:00
parent ce13beff68
commit b11879650c
60 changed files with 294 additions and 255 deletions

View File

@@ -6,7 +6,7 @@ services:
# Core services
resolver:
image: ghcr.io/mailu/unbound:{{mailu_version}}
image: ghcr.io/mailu/unbound:{{applications.mailu.version}}
env_file: mailu.env
restart: {{docker_restart_policy}}
{% include 'templates/docker/container/networks.yml.j2' %}
@@ -15,7 +15,7 @@ services:
driver: journald
front:
image: ghcr.io/mailu/nginx:{{mailu_version}}
image: ghcr.io/mailu/nginx:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
logging:
@@ -43,7 +43,7 @@ services:
- 192.168.203.254
admin:
image: ghcr.io/mailu/admin:{{mailu_version}}
image: ghcr.io/mailu/admin:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
volumes:
@@ -61,7 +61,7 @@ services:
{% include 'templates/docker/container/networks.yml.j2' %}
imap:
image: ghcr.io/mailu/dovecot:{{mailu_version}}
image: ghcr.io/mailu/dovecot:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
volumes:
@@ -77,7 +77,7 @@ services:
{% include 'templates/docker/container/networks.yml.j2' %}
smtp:
image: ghcr.io/mailu/postfix:{{mailu_version}}
image: ghcr.io/mailu/postfix:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
volumes:
@@ -93,7 +93,7 @@ services:
{% include 'templates/docker/container/networks.yml.j2' %}
oletools:
image: ghcr.io/mailu/oletools:{{mailu_version}}
image: ghcr.io/mailu/oletools:{{applications.mailu.version}}
hostname: oletools
restart: {{docker_restart_policy}}
depends_on:
@@ -104,7 +104,7 @@ services:
noinet:
antispam:
image: ghcr.io/mailu/rspamd:{{mailu_version}}
image: ghcr.io/mailu/rspamd:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
volumes:
@@ -140,7 +140,7 @@ services:
{% include 'templates/docker/container/networks.yml.j2' %}
webdav:
image: ghcr.io/mailu/radicale:{{mailu_version}}
image: ghcr.io/mailu/radicale:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
volumes:
@@ -155,7 +155,7 @@ services:
radicale:
fetchmail:
image: ghcr.io/mailu/fetchmail:{{mailu_version}}
image: ghcr.io/mailu/fetchmail:{{applications.mailu.version}}
volumes:
- "admin_data:/data"
restart: {{docker_restart_policy}}
@@ -172,7 +172,7 @@ services:
{% include 'templates/docker/container/networks.yml.j2' %}
webmail:
image: ghcr.io/mailu/webmail:{{mailu_version}}
image: ghcr.io/mailu/webmail:{{applications.mailu.version}}
restart: {{docker_restart_policy}}
env_file: mailu.env
volumes:
@@ -204,7 +204,7 @@ services:
ipam:
driver: default
config:
- subnet: {{mailu_subnet}}
- subnet: {{applications.mailu.subnet}}
radicale:
driver: bridge
webmail:

View File

@@ -15,10 +15,10 @@ LD_PRELOAD=/usr/lib/libhardened_malloc.so
SECRET_KEY={{mailu_secret_key}}
# Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!)
SUBNET={{mailu_subnet}}
SUBNET={{applications.mailu.subnet}}
# Main mail domain
DOMAIN={{mailu_domain}}
DOMAIN={{applications.mailu.domain}}
# Hostnames for this server, separated with comas
HOSTNAMES={{domain}}