diff --git a/README.md b/README.md index 9669d97..c5d92b6 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Based on [`mediawiki`][mediawiki]. 1. `abra app YOURAPPDOMAIN config` - 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. For `postfix_relay`, add the domain to your email config – `EXTRA_SENDER_DOMAINS` in +2. For `postfix_relay`, add the domain to your email config – `EXTRA_SENDER_DOMAINS` in `postfix_relay`. This doesn't seem to be required for Mailu. 3. `abra app YOURAPPDOMAIN deploy` @@ -47,15 +47,15 @@ system. Patches to make this configurable are welcome! abra app YOURAPPDOMAIN secret generate saml_secret_salt v1 "pwgen -n 64 1" ``` 3. `abra app YOURAPPDOMAIN deploy` -5. Copy your SimpleSAMLphp metadata and certificates to the container (assuming +4. Copy your SimpleSAMLphp metadata and certificates to the container (assuming you have local `metadata` and `cert` folders: ``` abra app YOURAPPDOMAIN cp metadata simplesaml:/var/simplesamlphp/ abra app YOURAPPDOMAIN cp cert simplesaml:/var/simplesamlphp/ ``` -6. You can log into SimpleSAMLphp using the password you generated at +5. You can log into SimpleSAMLphp using the password you generated at https://$DOMAIN/simplesaml/ and test authentication -7. Edit SimpleSAMLphp's `config.php` and change `store.sql.dsn`: +6. Edit SimpleSAMLphp's `config.php` and change `store.sql.dsn`: ``` abra app YOURAPPDOMAIN run simplesaml vi /var/simplesamlphp/config/config.php # find 'store.sql.dsn' and edit to: @@ -66,9 +66,11 @@ system. Patches to make this configurable are welcome! 1. `abra app YOURAPPDOMAIN config` - uncomment lines in the `OPENID` section (including `COMPOSE_FILE`) 2. Store your Keycloak-generated client secret in Docker: + ``` abra app YOURAPPDOMAIN secret insert openid_client_secret v1 put-your-secret-here ``` + 3. `abra deploy` ## License diff --git a/compose.simplesaml.yml b/compose.simplesaml.yml index 9dcaf92..5eef8c5 100644 --- a/compose.simplesaml.yml +++ b/compose.simplesaml.yml @@ -1,11 +1,11 @@ --- -version: '3.8' +version: "3.8" services: app: volumes: - - 'simplesaml:/var/simplesamlphp/' - - 'simplesaml_log:/var/simplesamlphp/log' + - "simplesaml:/var/simplesamlphp/" + - "simplesaml_log:/var/simplesamlphp/log" environment: - SAML_AUTH_SOURCE_ID - SAML_EMAIL_ATTRIBUTE