diff options
| author | yalh76 <yalh@yahoo.com> | 2020-02-18 19:49:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 19:49:29 +0100 |
| commit | df1d3b83108d43e898b99e26adbeea32d8961b69 (patch) | |
| tree | 9476bc0b4777ad4f8772276af74c549c0ddbfd0b /conf | |
| parent | 168573d3d7dcc4306691f21d5b64819d1f6dd38c (diff) | |
| parent | 62855b6febe3a3d9ee7c36329c57317b3b52bf48 (diff) | |
| download | mastodon_ynh-df1d3b83108d43e898b99e26adbeea32d8961b69.tar.gz mastodon_ynh-df1d3b83108d43e898b99e26adbeea32d8961b69.tar.bz2 mastodon_ynh-df1d3b83108d43e898b99e26adbeea32d8961b69.zip | |
Merge pull request #192 from YunoHost-Apps/testing
Upgrade to 3.1.1
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/.env.production.sample | 20 | ||||
| -rw-r--r-- | conf/app.src | 4 |
2 files changed, 19 insertions, 5 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 diff --git a/conf/app.src b/conf/app.src index ae219ff..5e78c4e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.0.1.tar.gz -SOURCE_SUM=8a9d2bd0d6ad1c7e2a3ecb7561595f7c2186d161cd9be675c08aadb4a07ee475 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.1.tar.gz +SOURCE_SUM=4d44458b28667e49bc0d69e7f344a953f869a0df5e41140d932982aa952ab13c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true |