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

settings: Move bot email defaults to default_settings. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-06-09 20:55:57 -07:00 committed by Tim Abbott
parent 8ba25960e7
commit 18eba18df7
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zproject/default_settings.py
View File

@ -180,6 +180,13 @@ DEVELOPMENT_LOG_EMAILS = DEVELOPMENT
# one or a handful of realms, though they might on an installation
# like Zulip Cloud or to work around a problem on another server.
NOTIFICATION_BOT = 'notification-bot@zulip.com'
EMAIL_GATEWAY_BOT = 'emailgateway@zulip.com'
NAGIOS_SEND_BOT = 'nagios-send-bot@zulip.com'
NAGIOS_RECEIVE_BOT = 'nagios-receive-bot@zulip.com'
WELCOME_BOT = 'welcome-bot@zulip.com'
REMINDER_BOT = 'reminder-bot@zulip.com'
# The following bots are optional system bots not enabled by
# default. The default ones are defined in INTERNAL_BOTS, in settings.py.
@ -188,8 +195,8 @@ DEVELOPMENT_LOG_EMAILS = DEVELOPMENT
ERROR_BOT: Optional[str] = None
# These are extra bot users for our end-to-end Nagios message
# sending tests.
NAGIOS_STAGING_SEND_BOT: Optional[str] = None
NAGIOS_STAGING_RECEIVE_BOT: Optional[str] = None
NAGIOS_STAGING_SEND_BOT = 'nagios-staging-send-bot@zulip.com' if PRODUCTION else None
NAGIOS_STAGING_RECEIVE_BOT = 'nagios-staging-receive-bot@zulip.com' if PRODUCTION else None
# SYSTEM_BOT_REALM would be a constant always set to 'zulip',
# except that it isn't that on Zulip Cloud. We will likely do a
# migration and eliminate this parameter in the future.

6
zproject/settings.py
View File

@ -492,12 +492,6 @@ if PRODUCTION:
INTERNAL_BOT_DOMAIN = "zulip.com"
# Set the realm-specific bot names
for bot in INTERNAL_BOTS + REALM_INTERNAL_BOTS + DISABLED_REALM_INTERNAL_BOTS:
if vars().get(bot['var_name']) is None:
bot_email = bot['email_template'] % (INTERNAL_BOT_DOMAIN,)
vars()[bot['var_name']] = bot_email
########################################################################
# STATSD CONFIGURATION
########################################################################