diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-12-28 17:48:40 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-28 17:48:40 +0100 |
commit | ad292792142a53fac05fac11e57ede103be2bdee (patch) | |
tree | 6608ef7a5978b1071589d4891f8074241136a883 /.env.nanobox | |
parent | f064cd4fb8057af04f0f1db6a98fc45935811e25 (diff) | |
parent | 7ff7ca8c7c8d6612760db93d533a18e83b0a9c70 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `README.md` - `package.json`
Diffstat (limited to '.env.nanobox')
-rw-r--r-- | .env.nanobox | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.env.nanobox b/.env.nanobox index 03aa01a34..5951777a2 100644 --- a/.env.nanobox +++ b/.env.nanobox @@ -231,8 +231,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io # Optional SAML authentication (cf. omniauth-saml) # SAML_ENABLED=true -# SAML_ACS_URL= -# SAML_ISSUER=http://localhost:3000/auth/auth/saml/callback +# SAML_ACS_URL=http://localhost:3000/auth/auth/saml/callback +# SAML_ISSUER=https://example.com # SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO # SAML_IDP_CERT= # SAML_IDP_CERT_FINGERPRINT= |