aboutsummaryrefslogtreecommitdiff
path: root/conf/.env.production.sample
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2020-02-09 12:42:32 +0100
committeryalh76 <yalh@yahoo.com>2020-02-09 12:42:32 +0100
commitad105db3e151df638402de7c14a39dbec473aba1 (patch)
tree793796f2b0caf52d5e048ca21c1d86b824397f36 /conf/.env.production.sample
parenta85f1bbe2f147fe89098e26a4b17922390eabeeb (diff)
downloadmastodon_ynh-ad105db3e151df638402de7c14a39dbec473aba1.tar.gz
mastodon_ynh-ad105db3e151df638402de7c14a39dbec473aba1.tar.bz2
mastodon_ynh-ad105db3e151df638402de7c14a39dbec473aba1.zip
Upgrade to 3.1.0
Diffstat (limited to 'conf/.env.production.sample')
-rw-r--r--conf/.env.production.sample20
1 files changed, 17 insertions, 3 deletions
diff --git a/conf/.env.production.sample b/conf/.env.production.sample
index 94c65b8..8b992d9 100644
--- a/conf/.env.production.sample
+++ b/conf/.env.production.sample
@@ -178,7 +178,11 @@ STREAMING_CLUSTER_NUM=1
# LDAP_BIND_DN=uid=__LDAP_USER__,ou=users,dc=yunohost,dc=org
# LDAP_PASSWORD=__LDAP_PASSWORD__
# LDAP_UID=uid
-# LDAP_SEARCH_FILTER="%{uid}=%{email}"
+# LDAP_MAIL=mail
+# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email}))
+# LDAP_UID_CONVERSION_ENABLED=true
+# LDAP_UID_CONVERSION_SEARCH=., -
+# LDAP_UID_CONVERSION_REPLACE=_
# PAM authentication (optional)
# PAM authentication uses for the email generation the "email" pam variable
@@ -222,8 +226,8 @@ STREAMING_CLUSTER_NUM=1
# 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=
@@ -246,3 +250,13 @@ STREAMING_CLUSTER_NUM=1
# http_proxy=http://gateway.local:8118
# Access control for hidden service.
# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
+
+# Authorized fetch mode (optional)
+# Require remote servers to authentify when fetching toots, see
+# https://docs.joinmastodon.org/admin/config/#authorized_fetch
+# AUTHORIZED_FETCH=true
+
+# Whitelist mode (optional)
+# Only allow federation with whitelisted domains, see
+# https://docs.joinmastodon.org/admin/config/#whitelist_mode
+# WHITELIST_MODE=true