Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Write fewer values into template settings files. 

This makes it easier for us to change the default values for these
settings, and also just helps keep settings files clear of values that
the relevant organization didn't choose themselves.

There's about a dozen more settings that could receive similar
treatment; I just went with the easiest ones.
This commit is contained in:
Tim Abbott 2024-11-04 17:07:56 -08:00
parent 898af8a9af
commit 30c54d023b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zproject/default_settings.py
View File

@ -222,6 +222,9 @@ AVATAR_CHANGES_DISABLED = False
PASSWORD_MIN_LENGTH = 6 PASSWORD_MIN_LENGTH = 6
PASSWORD_MIN_GUESSES = 10000 PASSWORD_MIN_GUESSES = 10000
SESSION_EXPIRE_AT_BROWSER_CLOSE = False
SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # 2 weeks
ZULIP_SERVICES_URL = "https://push.zulipchat.com" ZULIP_SERVICES_URL = "https://push.zulipchat.com"
ZULIP_SERVICE_PUSH_NOTIFICATIONS = False ZULIP_SERVICE_PUSH_NOTIFICATIONS = False

14
zproject/prod_settings_template.py
View File

@ -763,10 +763,10 @@ SOCIAL_AUTH_SAML_SUPPORT_CONTACT = {
# PROMOTE_SPONSORING_ZULIP = True # PROMOTE_SPONSORING_ZULIP = True
## Controls whether session cookies expire when the browser closes ## Controls whether session cookies expire when the browser closes
SESSION_EXPIRE_AT_BROWSER_CLOSE = False # SESSION_EXPIRE_AT_BROWSER_CLOSE = False
## Session cookie expiry in seconds after the last page load ## Session cookie expiry in seconds after the last page load
SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # 2 weeks # SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # 2 weeks
## Password strength requirements; learn about configuration at ## Password strength requirements; learn about configuration at
## https://zulip.readthedocs.io/en/latest/production/security-model.html. ## https://zulip.readthedocs.io/en/latest/production/security-model.html.
@ -778,7 +778,7 @@ SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # 2 weeks
## Controls whether or not Zulip will parse links starting with ## Controls whether or not Zulip will parse links starting with
## "file:///" as a hyperlink (useful if you have e.g. an NFS share). ## "file:///" as a hyperlink (useful if you have e.g. an NFS share).
ENABLE_FILE_LINKS = False # ENABLE_FILE_LINKS = False
## By default, files uploaded by users and profile pictures are stored ## By default, files uploaded by users and profile pictures are stored
## directly on the Zulip server. You can configure files being instead ## directly on the Zulip server. You can configure files being instead
@ -804,21 +804,21 @@ LOCAL_UPLOADS_DIR = "/home/zulip/uploads"
## Maximum allowed size of uploaded files, in megabytes. Set ## Maximum allowed size of uploaded files, in megabytes. Set
## MAX_FILE_UPLOAD_SIZE to 0 to disable file uploads completely ## MAX_FILE_UPLOAD_SIZE to 0 to disable file uploads completely
## (including hiding upload-related options from UI). ## (including hiding upload-related options from UI).
MAX_FILE_UPLOAD_SIZE = 100 # MAX_FILE_UPLOAD_SIZE = 100
## Controls whether name changes are completely disabled for this ## Controls whether name changes are completely disabled for this
## installation. This is useful when you're syncing names from an ## installation. This is useful when you're syncing names from an
## integrated LDAP/Active Directory. ## integrated LDAP/Active Directory.
NAME_CHANGES_DISABLED = False # NAME_CHANGES_DISABLED = False
## Controls whether avatar changes are completely disabled for this ## Controls whether avatar changes are completely disabled for this
## installation. This is useful when you're syncing avatars from an ## installation. This is useful when you're syncing avatars from an
## integrated LDAP/Active Directory. ## integrated LDAP/Active Directory.
AVATAR_CHANGES_DISABLED = False # AVATAR_CHANGES_DISABLED = False
## Controls whether users who have not uploaded an avatar will receive an avatar ## Controls whether users who have not uploaded an avatar will receive an avatar
## from gravatar.com. ## from gravatar.com.
ENABLE_GRAVATAR = True # ENABLE_GRAVATAR = True
## To override the default avatar image if ENABLE_GRAVATAR is False, place your ## To override the default avatar image if ENABLE_GRAVATAR is False, place your
## custom default avatar image at /home/zulip/local-static/default-avatar.png ## custom default avatar image at /home/zulip/local-static/default-avatar.png