Unbreak mailrelay config
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
8af9be6a40
commit
be6cf302d0
|
@ -29,11 +29,16 @@ SECRET_DB_PASSWORD_VERSION=v1
|
||||||
# define('FORCE_SSL_ADMIN', true );\
|
# define('FORCE_SSL_ADMIN', true );\
|
||||||
# define('COOKIE_DOMAIN', \$_SERVER['HTTP_HOST']);"
|
# define('COOKIE_DOMAIN', \$_SERVER['HTTP_HOST']);"
|
||||||
|
|
||||||
# SMTP
|
# Local SMTP relay
|
||||||
#COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
|
#COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
|
||||||
#SMTP_HOST="postfix_relay_app"
|
#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_PORT=587
|
||||||
#SMTP_AUTH=on
|
#SMTP_AUTH=on
|
||||||
#SMTP_TLS=on
|
#SMTP_TLS=on
|
||||||
#MAIL_FROM="wordpress@example.com"
|
|
||||||
#SECRET_SMTP_PASSWORD_VERSION=v1
|
#SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
|
@ -4,13 +4,8 @@ version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
entrypoint: /docker-entrypoint.mailrelay.sh
|
entrypoint: /docker-entrypoint.mailrelay.sh
|
||||||
secrets:
|
|
||||||
- smtp_password
|
|
||||||
environment:
|
environment:
|
||||||
- SMTP_HOST=${SMTP_HOST}
|
- SMTP_HOST=${SMTP_HOST}
|
||||||
- SMTP_PORT=${SMTP_PORT:25}
|
|
||||||
- SMTP_AUTH=${SMTP_AUTH}
|
|
||||||
- SMTP_TLS=${SMTP_TLS}
|
|
||||||
- MAIL_FROM=${MAIL_FROM}
|
- MAIL_FROM=${MAIL_FROM}
|
||||||
configs:
|
configs:
|
||||||
- source: mstmp_conf
|
- source: mstmp_conf
|
||||||
|
@ -28,8 +23,3 @@ configs:
|
||||||
name: ${STACK_NAME}_entrypoint_mailrelay_${ENTRYPOINT_MAILRELAY_CONF_VERSION}
|
name: ${STACK_NAME}_entrypoint_mailrelay_${ENTRYPOINT_MAILRELAY_CONF_VERSION}
|
||||||
file: entrypoint.mailrelay.sh.tmpl
|
file: entrypoint.mailrelay.sh.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
|
||||||
secrets:
|
|
||||||
smtp_password:
|
|
||||||
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
|
|
||||||
external: true
|
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue