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.
This commit is contained in:
Vishnu Ks 2016-06-27 00:55:47 +05:30 committed by Tim Abbott
parent 5b68e0defe
commit a7ead9e99d
8 changed files with 6 additions and 22 deletions

View File

@ -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

View File

@ -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

View File

@ -36,7 +36,6 @@ cat >>/etc/zulip/settings.py <<EOF
# Travis CI override settings above
EXTERNAL_HOST = '127.0.0.1'
ZULIP_ADMINISTRATOR = 'zulip-travis-admin@travis.example.com'
ADMIN_DOMAIN = 'travis.example.com'
AUTHENTICATION_BACKENDS = ( 'zproject.backends.EmailAuthBackend', )
NOREPLY_EMAIL_ADDRESS = 'noreply@travis.example.com'
DEFAULT_FROM_EMAIL = "Zulip <zulip@travis.example.com>"

View File

@ -63,12 +63,8 @@ class Command(BaseCommand):
email_gateway_bot.is_api_super_user = True
email_gateway_bot.save()
(admin_realm, _) = do_create_realm(settings.ADMIN_DOMAIN,
settings.ADMIN_DOMAIN, True)
set_default_streams(admin_realm, settings.DEFAULT_NEW_REALM_STREAMS)
self.stdout.write("Successfully populated database with initial data.\n")
self.stdout.write("Please run ./manage.py generate_realm_creation_link to generate link for creating organization")
site = Site.objects.get_current()
site.domain = settings.EXTERNAL_HOST

View File

@ -12,7 +12,6 @@ AUTHENTICATION_BACKENDS = ('zproject.backends.DevAuthBackend',)
# 'zproject.backends.GoogleMobileOauth2Backend',)
EXTERNAL_URI_SCHEME = "http://"
EMAIL_GATEWAY_PATTERN = "%s@" + EXTERNAL_HOST
ADMIN_DOMAIN = "zulip.com"
NOTIFICATION_BOT = "notification-bot@zulip.com"
ERROR_BOT = "error-bot@zulip.com"
NEW_USER_BOT = "new-user-bot@zulip.com"

View File

@ -88,9 +88,6 @@ DBX_APNS_CERT_FILE = "/etc/ssl/django-private/dbx-apns-dist.pem"
GOOGLE_OAUTH2_CLIENT_ID = '835904834568-ag4p18v0sd9a0tero14r3gekn6shoen3.apps.googleusercontent.com'
# Administrator domain for this install
ADMIN_DOMAIN = "zulip.com"
# The email address pattern to use for auto-generated stream emails
# The %s will be replaced with a unique token.
if ZULIP_COM_STAGING:

View File

@ -16,9 +16,6 @@ EXTERNAL_HOST = 'zulip.example.com'
# Voyager installation. Will also get support emails. (e.g. zulip-admin@example.com)
ZULIP_ADMINISTRATOR = 'zulip-admin@example.com'
# The domain for your organization, e.g. example.com
ADMIN_DOMAIN = 'example.com'
# Enable at least one of the following authentication backends.
# See http://zulip.readthedocs.io/en/latest/prod-authentication-methods.html
# for documentation on our authentication backends.

View File

@ -188,7 +188,6 @@ ALLOWED_HOSTS += ['127.0.0.1', 'localhost']
# of pairs of (setting name, default value that it must be changed from)
REQUIRED_SETTINGS = [("EXTERNAL_HOST", "zulip.example.com"),
("ZULIP_ADMINISTRATOR", "zulip-admin@example.com"),
("ADMIN_DOMAIN", "example.com"),
# SECRET_KEY doesn't really need to be here, in
# that we set it automatically, but just in
# case, it seems worth having in this list