diff --git a/docker-compose.yml b/docker-compose.yml index deb78fa..bb25604 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,8 @@ name: mailuwuemail volumes: # SSL - certs: - vhost.d: - html: - acme: + next_certs: + external: true # mail mail_data: mail_state: @@ -28,13 +26,14 @@ services: volumes: - mail_data:/var/mail/ - mail_state:/var/mail-state/ - - certs:/etc/letsencrypt/live/ + - next_certs:/etc/letsencrypt/live/ - ./config/:/tmp/docker-mailserver/ - ./priv_config/opendkim/:/tmp/docker-mailserver/opendkim/ environment: - SSL_TYPE=letsencrypt - LETSENCRYPT_HOST=mail.uwu.email - VIRTUAL_HOST=mail.uwu.email + - ONE_DIR=1 - DMS_DEBUG=1 - SPOOF_PROTECTION=0 #1 @@ -67,41 +66,9 @@ services: # TODO Use Postgres - roundcube_sqlite:/var/roundcube/db networks: - - proxy-tier + - next_proxy-tier - default -# SSL - reverse_proxy: - image: docker.io/nginxproxy/nginx-proxy:alpine - restart: always - labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" - volumes: - - certs:/etc/nginx/certs:ro - - vhost.d:/etc/nginx/vhost.d - - html:/usr/share/nginx/html - - /var/run/docker.sock:/tmp/docker.sock:ro - ports: - - 80:80 - - 443:443 - networks: - - proxy-tier - letsencrypt-companion: - image: docker.io/nginxproxy/acme-companion - restart: always - volumes: - - certs:/etc/nginx/certs - - acme:/etc/acme.sh - - vhost.d:/etc/nginx/vhost.d - - html:/usr/share/nginx/html - - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - proxy-tier - depends_on: - - reverse_proxy - environment: - #- ACME_CA_URI=https://acme-staging-v02.api.letsencrypt.org/directory # test-server - - DEFAULT_EMAIL=admin@uwu.email - networks: - proxy-tier: + next_proxy-tier: + external: true