paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-17 12:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify deployment role configuration.

Browse Source 
(imported from commit f9a9cf0ae33e7a74517255f944c91fa9aba14e33)
This commit is contained in:
Tim Abbott
2013-11-14 12:38:09 -05:00
parent 4a74425f37
commit 66bbf40b5a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zproject/local_settings_template.py
View File

@@ -13,10 +13,9 @@ ZULIP_ADMINISTRATOR = ''
# The domain for your organization, e.g. example.com # The domain for your organization, e.g. example.com
ADMIN_DOMAIN = '' ADMIN_DOMAIN = ''
# These credentials are for communication with the central Zulip # The deployment key is used by your server to authenticate any
# deployment manager. You should have been provided with them by # communication with Zulip. You can obtain your key from
# Zulip support. # https://zulip.com/enterprise/download/deployment-key
DEPLOYMENT_ROLE_NAME = ''
DEPLOYMENT_ROLE_KEY = '' DEPLOYMENT_ROLE_KEY = ''
# Enable at least one of the following authentication backends. # Enable at least one of the following authentication backends.

2
zproject/settings.py
View File

@@ -246,6 +246,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'LOCAL_UPLOADS_DIR': None, 'LOCAL_UPLOADS_DIR': None,
'DROPBOX_APP_KEY': '', 'DROPBOX_APP_KEY': '',
'ERROR_REPORTING': True, 'ERROR_REPORTING': True,
'DEPLOYMENT_ROLE_NAME': ADMIN_DOMAIN,
# The following bots only exist in non-ENTERPRISE installs # The following bots only exist in non-ENTERPRISE installs
'ERROR_BOT': None, 'ERROR_BOT': None,
'NEW_USER_BOT': None, 'NEW_USER_BOT': None,
@@ -276,7 +277,6 @@ MANAGERS = ADMINS
REQUIRED_SETTINGS = [("EXTERNAL_HOST", ""), REQUIRED_SETTINGS = [("EXTERNAL_HOST", ""),
("ZULIP_ADMINISTRATOR", ""), ("ZULIP_ADMINISTRATOR", ""),
("ADMIN_DOMAIN", ""), ("ADMIN_DOMAIN", ""),
("DEPLOYMENT_ROLE_NAME", ""),
("DEPLOYMENT_ROLE_KEY", ""), ("DEPLOYMENT_ROLE_KEY", ""),
# SECRET_KEY doesn't really need to be here, in # SECRET_KEY doesn't really need to be here, in
# that we set it automatically, but just in # that we set it automatically, but just in