Merge remote-tracking branch 'upstream/master' into feat-unbound-dns

This commit is contained in:
Tim Möhlmann
2018-10-23 12:16:36 +03:00
122 changed files with 2391 additions and 1302 deletions

View File

@@ -6,6 +6,8 @@ services:
image: mailu/nginx:$VERSION
restart: always
env_file: .env
logging:
driver: $LOG_DRIVER
ports:
- "$BIND_ADDRESS4:80:80"
- "$BIND_ADDRESS4:443:443"
@@ -54,7 +56,6 @@ services:
restart: always
env_file: .env
volumes:
- "$ROOT/data:/data"
- "$ROOT/mail:/mail"
- "$ROOT/overrides:/overrides"
depends_on:
@@ -68,7 +69,6 @@ services:
restart: always
env_file: .env
volumes:
- "$ROOT/data:/data"
- "$ROOT/overrides:/overrides"
depends_on:
- front
@@ -142,8 +142,6 @@ services:
image: mailu/fetchmail:$VERSION
restart: always
env_file: .env
volumes:
- "$ROOT/data:/data"
depends_on:
- unbound
dns:
@@ -156,3 +154,4 @@ networks:
driver: default
config:
- subnet: 10.177.20.0/24