diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
| commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
| tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /.env.production.sample | |
| parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
| parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to '.env.production.sample')
| -rw-r--r-- | .env.production.sample | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.env.production.sample b/.env.production.sample index d46768d09..d920f18e9 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -33,7 +33,6 @@ LOCAL_DOMAIN=example.com # Application secrets # Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose) -PAPERCLIP_SECRET= SECRET_KEY_BASE= OTP_SECRET= @@ -143,6 +142,16 @@ STREAMING_CLUSTER_NUM=1 # Maximum allowed character count # MAX_TOOT_CHARS=500 +# LDAP authentication (optional) +# LDAP_ENABLED=true +# LDAP_HOST=localhost +# LDAP_PORT=389 +# LDAP_METHOD=simple_tls +# LDAP_BASE= +# LDAP_BIND_DN= +# LDAP_PASSWORD= +# LDAP_UID=cn + # PAM authentication (optional) # PAM authentication uses for the email generation the "email" pam variable # and optional as fallback PAM_DEFAULT_SUFFIX @@ -153,7 +162,7 @@ STREAMING_CLUSTER_NUM=1 # PAM_DEFAULT_SUFFIX=pam # Name of the pam service (pam "auth" section is evaluated) # PAM_DEFAULT_SERVICE=rpam -# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) +# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default) # PAM_CONTROLLED_SERVICE=rpam # Global OAuth settings (optional) : @@ -186,7 +195,7 @@ STREAMING_CLUSTER_NUM=1 # Optional SAML authentication (cf. omniauth-saml) # SAML_ENABLED=true # SAML_ACS_URL= -# SAML_ISSUER=http://localhost:3000/auth/auth/saml/metadata +# SAML_ISSUER=http://localhost:3000/auth/auth/saml/callback # SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO # SAML_IDP_CERT= # SAML_IDP_CERT_FINGERPRINT= |