Remove needless compose.mailrelay.yml
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
c581eeeae5
commit
13b9306858
|
@ -10,6 +10,10 @@ export MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
|
||||||
export MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
|
export MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
|
||||||
export MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
|
export MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
|
||||||
|
|
||||||
|
## SMTP
|
||||||
|
#export SMTP_HOST=postfix_relay_app
|
||||||
|
#export SMTP_HOST=mailu_front
|
||||||
|
|
||||||
export DB_ROOT_PASSWORD_VERSION=v1
|
export DB_ROOT_PASSWORD_VERSION=v1
|
||||||
export DB_PASSWORD_VERSION=v1
|
export DB_PASSWORD_VERSION=v1
|
||||||
export MEDIAWIKI_SECRET_KEY_VERSION=v1
|
export MEDIAWIKI_SECRET_KEY_VERSION=v1
|
||||||
|
@ -44,8 +48,3 @@ export PHP_INI_VERSION=v1
|
||||||
# export OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
|
# export OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
|
||||||
# export OPENID_CLIENT_ID="mediawiki"
|
# export OPENID_CLIENT_ID="mediawiki"
|
||||||
# export OPENID_CLIENT_SECRET_VERSION=v1
|
# export OPENID_CLIENT_SECRET_VERSION=v1
|
||||||
|
|
||||||
## SMTP
|
|
||||||
#export COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
|
|
||||||
#export SMTP_HOST=postfix_relay_app
|
|
||||||
#export SMTP_HOST=mailu_front
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
---
|
|
||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
environment:
|
|
||||||
- SMTP_HOST=${SMTP_HOST}
|
|
||||||
networks:
|
|
||||||
- mail
|
|
||||||
|
|
||||||
networks:
|
|
||||||
mail:
|
|
||||||
external: true
|
|
|
@ -17,6 +17,7 @@ services:
|
||||||
- DB_HOST=db
|
- DB_HOST=db
|
||||||
- DB_USER=mediawiki
|
- DB_USER=mediawiki
|
||||||
- DB_NAME=mediawiki
|
- DB_NAME=mediawiki
|
||||||
|
- SMTP_HOST
|
||||||
volumes:
|
volumes:
|
||||||
- "mediawiki_images:/var/www/html/images"
|
- "mediawiki_images:/var/www/html/images"
|
||||||
configs:
|
configs:
|
||||||
|
|
Reference in New Issue