Simplify deployment role configuration.

(imported from commit f9a9cf0ae33e7a74517255f944c91fa9aba14e33)

zproject/local_settings_template.py

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

zproject/settings.py

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