From a7ead9e99db332e49991e4aaf04758f2c994b69c Mon Sep 17 00:00:00 2001 From: Vishnu Ks Date: Mon, 27 Jun 2016 00:55:47 +0530 Subject: [PATCH] settings: Eliminate ADMIN_DOMAIN for creating initial realm. We now use `./manage.py generate_realm_creation_link` as the flow flow for creating one's first realm. --- docs/prod-install.md | 3 --- scripts/setup/initialize-database | 10 +++++----- tools/travis/production-helper | 1 - zerver/management/commands/initialize_voyager_db.py | 6 +----- zproject/dev_settings.py | 1 - zproject/local_settings.py | 3 --- zproject/prod_settings_template.py | 3 --- zproject/settings.py | 1 - 8 files changed, 6 insertions(+), 22 deletions(-) diff --git a/docs/prod-install.md b/docs/prod-install.md index 3fda64f53b..ff7e879dbc 100644 --- a/docs/prod-install.md +++ b/docs/prod-install.md @@ -144,9 +144,6 @@ These settings include: - `ZULIP_ADMINISTRATOR`: the email address of the person or team maintaining this installation and who will get support emails. -- `ADMIN_DOMAIN`: the domain for your organization. Usually this is the main - domain used in your organization's email addresses. - - `AUTHENTICATION_BACKENDS`: a list of enabled authentication mechanisms. You'll need to enable at least one authentication mechanism by uncommenting its corresponding line, and then also do diff --git a/scripts/setup/initialize-database b/scripts/setup/initialize-database index 573df625bb..d8feb3cd4a 100755 --- a/scripts/setup/initialize-database +++ b/scripts/setup/initialize-database @@ -33,11 +33,11 @@ fi set +x echo "Congratulations! You have successfully configured your Zulip database." -echo "If you haven't already, you should configure email in /etc/zulip/settings.py" -echo "And then you should now be able to visit your server over https and sign up using" -echo "an email address that ends with @ADMIN_DOMAIN (from your settings file)." +echo "If you haven't already, you should configure email in /etc/zulip/settings.py." +echo "Then create your organization and user by opening the link to your Zulip" +echo "instance generated by ./manage.py generate_realm_creation_link." echo "" echo "See docs/prod-health-check-debug.md for instructions on how to confirm your Zulip " -echo "install is healthy, change ADMIN_DOMAIN, debug common issues, and otherwise finish " -echo "setting things up." +echo "install is healthy, change your realm's domain, debug common issues, and otherwise " +echo "finish setting things up." set -x diff --git a/tools/travis/production-helper b/tools/travis/production-helper index 8f9e498caf..d78ebda728 100755 --- a/tools/travis/production-helper +++ b/tools/travis/production-helper @@ -36,7 +36,6 @@ cat >>/etc/zulip/settings.py <