Unbreak mailrelay config
continuous-integration/drone/push Build is passing Details

This commit is contained in:
decentral1se 2021-06-02 11:20:24 +02:00
parent 8af9be6a40
commit be6cf302d0
No known key found for this signature in database
GPG Key ID: 92DAD76BD9567B8A
3 changed files with 25 additions and 12 deletions

View File

@ -29,11 +29,16 @@ SECRET_DB_PASSWORD_VERSION=v1
# define('FORCE_SSL_ADMIN', true );\
# define('COOKIE_DOMAIN', \$_SERVER['HTTP_HOST']);"
# SMTP
# Local SMTP relay
#COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
#SMTP_HOST="postfix_relay_app"
#MAIL_FROM="wordpress@example.com"
# Remote SMTP relay
#COMPOSE_FILE="compose.yml:compose.mailrelay.yml:compose.smtp.yml"
#SMTP_HOST="mail.example.com"
#MAIL_FROM="wordpress@example.com"
#SMTP_PORT=587
#SMTP_AUTH=on
#SMTP_TLS=on
#MAIL_FROM="wordpress@example.com"
#SECRET_SMTP_PASSWORD_VERSION=v1

View File

@ -4,13 +4,8 @@ version: "3.8"
services:
app:
entrypoint: /docker-entrypoint.mailrelay.sh
secrets:
- smtp_password
environment:
- SMTP_HOST=${SMTP_HOST}
- SMTP_PORT=${SMTP_PORT:25}
- SMTP_AUTH=${SMTP_AUTH}
- SMTP_TLS=${SMTP_TLS}
- MAIL_FROM=${MAIL_FROM}
configs:
- source: mstmp_conf
@ -28,8 +23,3 @@ configs:
name: ${STACK_NAME}_entrypoint_mailrelay_${ENTRYPOINT_MAILRELAY_CONF_VERSION}
file: entrypoint.mailrelay.sh.tmpl
template_driver: golang
secrets:
smtp_password:
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
external: true

18
compose.smtp.yml Normal file
View File

@ -0,0 +1,18 @@
---
version: "3.8"
services:
app:
secrets:
- smtp_password
environment:
- SMTP_HOST=${SMTP_HOST}
- SMTP_PORT=${SMTP_PORT:25}
- SMTP_AUTH=${SMTP_AUTH}
- SMTP_TLS=${SMTP_TLS}
- MAIL_FROM=${MAIL_FROM}
secrets:
smtp_password:
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
external: true