From 8490d0151ae810805adf6ff1eb23f54a7a239e42 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sat, 24 Oct 2020 19:01:49 +0200
Subject: [PATCH] Better SMTP settings

---
 .envrc.sample | 12 ++++++------
 README.md     | 24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.envrc.sample b/.envrc.sample
index 321a2ac..7eb5b4a 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -38,14 +38,14 @@ export COMPOSER_LOCAL_CONF_VERSION=v1
 
 #export SAML_ENTRYPOINT_CONF_VERSION=v1
 
-## SMTP
-#export COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
-#export SMTP_HOST=postfix_relay_app
-
-# OpenID Connect
-
+## OpenID Connect
 # export OPENID_ENABLED=1
 # export COMPOSE_FILE="compose.yml:compose.openid.yml"
 # export OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
 # export OPENID_CLIENT_ID="mediawiki"
 # 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
diff --git a/README.md b/README.md
index 62fa036..c7d8c39 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,19 @@ Based on [`mediawiki`][mediawiki].
 8. Create an initial admin user:
    `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
 [SimpleSAMLphp][simplesamlphp] and Mediawiki's
@@ -57,11 +69,15 @@ system. Patches to make this configurable are welcome!
    # 'sqlite:/var/simplesamlphp/data/simplesamlphp.sq3'
    ```
 
-## OpenID Connect
+### OpenID Connect
 
 1. Edit `.envrc` and uncomment lines in the `OPENID` section (including `COMPOSE_FILE`)
-1. `direnv allow`
-1. Get your Keycloak generated client secret and `docker secret create` it as `openid_client_secret`
+2. `direnv allow`
+3. Store your Keycloak-generated client secret in Docker:
+```
+abra secret insert openid_client_secret v1 put-your-secret-here
+```
+4. `abra deploy`
 
 ## License