samwightt/mediawiki
0
0
Fork 0
forked from coop-cloud/mediawiki
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better SMTP settings

Browse Source
This commit is contained in:
3wc 2020-10-24 19:01:49 +02:00
parent a8b31310ba
commit 8490d0151a
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.envrc.sample
View File

@ -38,14 +38,14 @@ export COMPOSER_LOCAL_CONF_VERSION=v1
#export SAML_ENTRYPOINT_CONF_VERSION=v1 #export SAML_ENTRYPOINT_CONF_VERSION=v1
## SMTP ## OpenID Connect
#export COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
#export SMTP_HOST=postfix_relay_app
# OpenID Connect
# export OPENID_ENABLED=1 # export OPENID_ENABLED=1
# export COMPOSE_FILE="compose.yml:compose.openid.yml" # export COMPOSE_FILE="compose.yml:compose.openid.yml"
# 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

24
README.md
View File

@ -24,7 +24,19 @@ Based on [`mediawiki`][mediawiki].
8. Create an initial admin user: 8. Create an initial admin user:
`abra run app php /var/www/html/maintenance/createAndPromote.php --sysop YourUsername YourPassword` `abra run app php /var/www/html/maintenance/createAndPromote.php --sysop YourUsername YourPassword`
## SimpleSAMLphp ## Email
1. Edit `.envrc` and uncomment the `SMTP` lines. Set `SMTP_HOST` to
`postfix_relay` for `coop-cloud/postfix_relay`, or `mailu_front` for
`coop-cloud/mailu` (assuming default stack names)
2. Make sure to add the domain to your email config – `EXTRA_SENDER_DOMAINS` in
`postfix_relay`, or in Mailu: Admin » Domains » Add.
3. `direnv allow` (or `source .envrc`)
4. `abra deploy`
## Single Sign On
### SimpleSAMLphp
This app includes optional SAML Single Sign On using This app includes optional SAML Single Sign On using
[SimpleSAMLphp][simplesamlphp] and Mediawiki's [SimpleSAMLphp][simplesamlphp] and Mediawiki's
@ -57,11 +69,15 @@ system. Patches to make this configurable are welcome!
# 'sqlite:/var/simplesamlphp/data/simplesamlphp.sq3' # 'sqlite:/var/simplesamlphp/data/simplesamlphp.sq3'
``` ```
## OpenID Connect ### OpenID Connect
1. Edit `.envrc` and uncomment lines in the `OPENID` section (including `COMPOSE_FILE`) 1. Edit `.envrc` and uncomment lines in the `OPENID` section (including `COMPOSE_FILE`)
1. `direnv allow` 2. `direnv allow`
1. Get your Keycloak generated client secret and `docker secret create` it as `openid_client_secret` 3. Store your Keycloak-generated client secret in Docker:
```
abra secret insert openid_client_secret v1 put-your-secret-here
```
4. `abra deploy`
## License ## License