paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Move production noreply templates.

Browse Source 
These previously lived in Optional settings, which generally caused
users to not read it.

(Also do a bit of reorganization of the "optional settings" area).
This commit is contained in:
Tim Abbott
2019-03-21 17:04:04 -07:00
parent 34b8626959
commit ca04b4f243
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
zproject/prod_settings_template.py
View File

@@ -20,6 +20,15 @@ from typing import Optional
# These settings MUST be set in production. In a development environment, # These settings MUST be set in production. In a development environment,
# sensible default values will be used. # sensible default values will be used.
# The email address for the person or team who maintains the Zulip
# installation. Note that this is a public-facing email address; it may
# appear on 404 pages, is used as the sender's address for many automated
# emails, and is advertised as a support address. An email address like
# support@example.com is totally reasonable, as is admin@example.com.
# Do not put a display name; e.g. 'support@example.com', not
# 'Zulip Support <support@example.com>'.
ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
# The user-accessible Zulip hostname for this installation, e.g. # The user-accessible Zulip hostname for this installation, e.g.
# zulip.example.com. This should match what users will put in their # zulip.example.com. This should match what users will put in their
# web browser. If you want to allow multiple hostnames, add the rest # web browser. If you want to allow multiple hostnames, add the rest
@@ -29,14 +38,18 @@ from typing import Optional
# EXTERNAL_HOST to e.g. zulip.example.com:1234 here. # EXTERNAL_HOST to e.g. zulip.example.com:1234 here.
EXTERNAL_HOST = 'zulip.example.com' EXTERNAL_HOST = 'zulip.example.com'
# The email address for the person or team who maintains the Zulip # Alternative hostnames. A comma-separated list of strings
# installation. Note that this is a public-facing email address; it may # representing the host/domain names that your users can enter in
# appear on 404 pages, is used as the sender's address for many automated # their browsers to access Zulip. This is a security measure; for
# emails, and is advertised as a support address. An email address like # details, see the Django documentation:
# support@example.com is totally reasonable, as is admin@example.com. # https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts
# Do not put a display name; e.g. 'support@example.com', not #
# 'Zulip Support <support@example.com>'. # Zulip automatically adds to this list 'localhost', '127.0.0.1', and
ZULIP_ADMINISTRATOR = 'zulip-admin@example.com' # patterns representing EXTERNAL_HOST and subdomains of it. If you are
# accessing your server by other hostnames, list them here.
#
# Note that these should just be hostnames, without port numbers.
#ALLOWED_HOSTS = ['zulip-alias.example.com', '192.0.2.1']
################ ################
@@ -64,10 +77,6 @@ ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
#EMAIL_USE_TLS = True #EMAIL_USE_TLS = True
#EMAIL_PORT = 587 #EMAIL_PORT = 587
################################
# Optional settings.
# The noreply address to be used as the sender for certain generated # The noreply address to be used as the sender for certain generated
# emails. Messages sent to this address could contain sensitive user # emails. Messages sent to this address could contain sensitive user
# data and should not be delivered anywhere. The default is # data and should not be delivered anywhere. The default is
@@ -87,18 +96,6 @@ ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
# The address should have no newlines. # The address should have no newlines.
#PHYSICAL_ADDRESS = '' #PHYSICAL_ADDRESS = ''
# A comma-separated list of strings representing the host/domain names
# that your users can enter in their browsers to access Zulip.
# This is a security measure; for details, see the Django documentation:
# https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts
#
# Zulip automatically adds to this list 'localhost', '127.0.0.1', and
# patterns representing EXTERNAL_HOST and subdomains of it. If you are
# accessing your server by other hostnames, list them here.
#
# Note that these should just be hostnames, without port numbers.
#ALLOWED_HOSTS = ['zulip-alias.example.com', '192.0.2.1']
################ ################
# Authentication settings. # Authentication settings.