diff options
| author | yalh76 <yalh@yahoo.com> | 2020-03-29 21:56:56 +0200 |
|---|---|---|
| committer | yalh76 <yalh@yahoo.com> | 2020-03-29 21:56:56 +0200 |
| commit | 64149e99b7b28f76f6cc25607637692610cb1bd6 (patch) | |
| tree | 2cfceadeceae634791a7fb207268b5943f3e0f5e /conf/.env.production.sample | |
| parent | 25a20b1d17f0b8752a39259c3b73a451e203255d (diff) | |
| parent | bf0dea0f437c00db213c27da299a0dda65810d6a (diff) | |
| download | mastodon_ynh-64149e99b7b28f76f6cc25607637692610cb1bd6.tar.gz mastodon_ynh-64149e99b7b28f76f6cc25607637692610cb1bd6.tar.bz2 mastodon_ynh-64149e99b7b28f76f6cc25607637692610cb1bd6.zip | |
Merge branch 'testing' into ldap
Diffstat (limited to 'conf/.env.production.sample')
| -rw-r--r-- | conf/.env.production.sample | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/conf/.env.production.sample b/conf/.env.production.sample index c55d99b..d2f4b91 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -69,6 +69,7 @@ SMTP_PORT=25 #SMTP_LOGIN= #SMTP_PASSWORD= SMTP_FROM_ADDRESS=__SMTP_FROM_ADDRESS__ +#SMTP_REPLY_TO= #SMTP_DOMAIN= # defaults to LOCAL_DOMAIN SMTP_DELIVERY_METHOD=sendmail # delivery method can also be smtp SMTP_AUTH_METHOD=none @@ -114,6 +115,20 @@ SMTP_OPENSSL_VERIFY_MODE=none # S3_ENDPOINT= # S3_SIGNATURE_VERSION= +# Google Cloud Storage (optional) +# Use S3 compatible API. Since GCS does not support Multipart Upload, +# increase the value of S3_MULTIPART_THRESHOLD to disable Multipart Upload. +# The attachment host must allow cross origin request - see the description +# above. +# S3_ENABLED=true +# AWS_ACCESS_KEY_ID= +# AWS_SECRET_ACCESS_KEY= +# S3_REGION= +# S3_PROTOCOL=https +# S3_HOSTNAME=storage.googleapis.com +# S3_ENDPOINT=https://storage.googleapis.com +# S3_MULTIPART_THRESHOLD=52428801 # 50.megabytes + # Swift (optional) # The attachment host must allow cross origin request - see the description # above. @@ -208,8 +223,8 @@ LDAP_TLS_NO_VERIFY=true # 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= @@ -232,3 +247,13 @@ LDAP_TLS_NO_VERIFY=true # 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 |