lieuwe/dockerconfig
1
0
Fork 0
mirror of https://github.com/lleene/dockerconfig.git synced 2025-01-22 21:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix use ssl cert provided by acme-helper for mailserver.

Browse Source
This commit is contained in:
Lieuwe Leene 2022-11-25 16:19:44 +01:00
parent 4f2e128589
commit dcf714e224
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/nginx/inbox_location
View File

@ -11,7 +11,7 @@ location ~ \.php$ {
fastcgi_keep_conn on; fastcgi_keep_conn on;
fastcgi_split_path_info ^(.+\.php)(.*)$; fastcgi_split_path_info ^(.+\.php)(.*)$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_pass inbox.zathura.leene.dev; fastcgi_pass inbox.leene.dev;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params; include fastcgi_params;

2
config/nginx/nextcloud_location
View File

@ -49,7 +49,7 @@ location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|u
fastcgi_param modHeadersAvailable true; fastcgi_param modHeadersAvailable true;
# Enable pretty urls # Enable pretty urls
fastcgi_param front_controller_active true; fastcgi_param front_controller_active true;
fastcgi_pass nextcloud.zathura.leene.dev; fastcgi_pass nextcloud.leene.dev;
fastcgi_intercept_errors on; fastcgi_intercept_errors on;
fastcgi_request_buffering off; fastcgi_request_buffering off;
} }

21
docker-compose.yaml
View File

@ -92,11 +92,11 @@ services:
- VIRTUAL_PORT=3000 - VIRTUAL_PORT=3000
- LETSENCRYPT_HOST=git.${NGINX_HOST} - LETSENCRYPT_HOST=git.${NGINX_HOST}
- GITEA__mailer__PASSWD=${SQL_PSWD} - GITEA__mailer__PASSWD=${SQL_PSWD}
- GITEA__server__DOMAIN = git.${NGINX_HOST} - GITEA__server__DOMAIN=git.${NGINX_HOST}
- GITEA__server__SSH_DOMAIN = git.${NGINX_HOST} - GITEA__server__SSH_DOMAIN=git.${NGINX_HOST}
- GITEA__server__ROOT_URL = https://git.${NGINX_HOST}/ - GITEA__server__ROOT_URL=https://git.${NGINX_HOST}/
- GITEA__server__CERT_FILE = /etc/letsencrypt/live/git.${NGINX_HOST}.crt - GITEA__server__CERT_FILE=/etc/letsencrypt/live/git.${NGINX_HOST}.crt
- GITEA__server__KEY_FILE = /etc/letsencrypt/live/git.${NGINX_HOST}.key - GITEA__server__KEY_FILE=/etc/letsencrypt/live/git.${NGINX_HOST}.key
volumes: volumes:
- gitea_data:/data:z - gitea_data:/data:z
- nginx_certs:/etc/letsencrypt/live:ro,z - nginx_certs:/etc/letsencrypt/live:ro,z
@ -139,6 +139,11 @@ services:
hostname: inbox hostname: inbox
domainname: ${NGINX_HOST} domainname: ${NGINX_HOST}
environment: environment:
- VIRTUAL_HOST=mail.${NGINX_HOST}
- LETSENCRYPT_HOST=mail.${NGINX_HOST}
- SSL_TYPE=manual
- SSL_CERT_PATH=/etc/letsencrypt/live/mail.${NGINX_HOST}.crt
- SSL_KEY_PATH=/etc/letsencrypt/live/mail.${NGINX_HOST}.key
- POSTMASTER_ADDRESS=admin@${NGINX_HOST} - POSTMASTER_ADDRESS=admin@${NGINX_HOST}
- RELAY_PASSWORD=${SENDGRID_APIKEY} - RELAY_PASSWORD=${SENDGRID_APIKEY}
ports: ports:
@ -200,6 +205,7 @@ services:
- HOSTNAME=${NGINX_HOST} - HOSTNAME=${NGINX_HOST}
- USERNAME=${GDNS_USERNAME} - USERNAME=${GDNS_USERNAME}
- PASSWORD=${GDNS_PASSWORD} - PASSWORD=${GDNS_PASSWORD}
- INTERVAL=9000
autodiscover: autodiscover:
<<: *defaults <<: *defaults
@ -211,11 +217,8 @@ services:
- LETSENCRYPT_HOST=autodiscover.${NGINX_HOST},autoconfig.${NGINX_HOST} - LETSENCRYPT_HOST=autodiscover.${NGINX_HOST},autoconfig.${NGINX_HOST}
- DOMAIN=${NGINX_HOST} - DOMAIN=${NGINX_HOST}
- IMAP_HOST=mail.${NGINX_HOST} - IMAP_HOST=mail.${NGINX_HOST}
- IMAP_PORT=993 - IMAP_PORT=1993
- IMAP_SOCKET=SSL - IMAP_SOCKET=SSL
- POP_HOST=mail.${NGINX_HOST}
- POP_PORT=995
- POP_SOCKET=SSL
- SMTP_HOST=mail.${NGINX_HOST} - SMTP_HOST=mail.${NGINX_HOST}
- SMTP_PORT=587 - SMTP_PORT=587
- SMTP_SOCKET=STARTTLS - SMTP_SOCKET=STARTTLS

5
local.env
View File

@ -1,8 +1,6 @@
## Docker Env ## Docker Env
PERMIT_DOCKER=network PERMIT_DOCKER=network
## Google Dynamic DNS
INTERVAL=900
## Mail Server Env ## Mail Server Env
POSTFIX_INET_PROTOCOLS=ipv4 POSTFIX_INET_PROTOCOLS=ipv4
@ -16,12 +14,11 @@ ENABLE_SASLAUTHD=0
ONE_DIR=1 ONE_DIR=1
TLS_LEVEL=modern TLS_LEVEL=modern
ENABLE_UPDATE_CHECK=1 ENABLE_UPDATE_CHECK=1
SSL_TYPE=letsencrypt
SPOOF_PROTECTION=1 SPOOF_PROTECTION=1
ENABLE_POP3=1
POSTSCREEN_ACTION=ignore POSTSCREEN_ACTION=ignore
ENABLE_DNSBL=0 ENABLE_DNSBL=0
ENABLE_QUOTAS=0 ENABLE_QUOTAS=0
ENABLE_POP3=0
RELAY_HOST=smtp.sendgrid.net RELAY_HOST=smtp.sendgrid.net
RELAY_PORT=587 RELAY_PORT=587