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

populate_db: Use separate realm for system bots, like in production. 

This commit alone breaks things, needs to be merged with the follow-up
ones.

welcome-bot is removed from the explicit list, because it already is in
settings.INTERNAL_BOTS.
This commit is contained in:
Mateusz Mandera 2019-07-24 08:34:15 +02:00 committed by Tim Abbott
parent bb46bc099b
commit 8e0b6fa6cf
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zilencer/management/commands/populate_db.py
View File

@ -177,9 +177,10 @@ class Command(BaseCommand):
# Start by clearing all the data in our database # Start by clearing all the data in our database
clear_database() clear_database()
# Create our two default realms # Create our three default realms
# Could in theory be done via zerver.lib.actions.do_create_realm, but # Could in theory be done via zerver.lib.actions.do_create_realm, but
# welcome-bot (needed for do_create_realm) hasn't been created yet # welcome-bot (needed for do_create_realm) hasn't been created yet
internal_realm = Realm.objects.create(string_id=settings.SYSTEM_BOT_REALM)
zulip_realm = Realm.objects.create( zulip_realm = Realm.objects.create(
string_id="zulip", name="Zulip Dev", emails_restricted_to_domains=True, string_id="zulip", name="Zulip Dev", emails_restricted_to_domains=True,
description="The Zulip development environment default organization." description="The Zulip development environment default organization."
@ -223,17 +224,19 @@ class Command(BaseCommand):
# These bots are directly referenced from code and thus # These bots are directly referenced from code and thus
# are needed for the test suite. # are needed for the test suite.
all_realm_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,)) internal_realm_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
for bot in settings.INTERNAL_BOTS] for bot in settings.INTERNAL_BOTS]
internal_realm_bots += [
("Zulip Feedback Bot", "feedback@zulip.com"),
]
zulip_realm_bots = [ zulip_realm_bots = [
("Zulip Error Bot", "error-bot@zulip.com"), ("Zulip Error Bot", "error-bot@zulip.com"),
("Zulip Default Bot", "default-bot@zulip.com"), ("Zulip Default Bot", "default-bot@zulip.com"),
("Welcome Bot", "welcome-bot@zulip.com"),
] ]
for i in range(options["extra_bots"]): for i in range(options["extra_bots"]):
zulip_realm_bots.append(('Extra Bot %d' % (i,), 'extrabot%d@zulip.com' % (i,))) zulip_realm_bots.append(('Extra Bot %d' % (i,), 'extrabot%d@zulip.com' % (i,)))
zulip_realm_bots.extend(all_realm_bots)
create_users(internal_realm, internal_realm_bots, bot_type=UserProfile.DEFAULT_BOT)
create_users(zulip_realm, zulip_realm_bots, bot_type=UserProfile.DEFAULT_BOT) create_users(zulip_realm, zulip_realm_bots, bot_type=UserProfile.DEFAULT_BOT)
# Initialize the email gateway bot as an API Super User # Initialize the email gateway bot as an API Super User
@ -535,11 +538,6 @@ class Command(BaseCommand):
] ]
create_users(zulip_realm, internal_zulip_users_nosubs, bot_type=UserProfile.DEFAULT_BOT) create_users(zulip_realm, internal_zulip_users_nosubs, bot_type=UserProfile.DEFAULT_BOT)
zulip_cross_realm_bots = [
("Zulip Feedback Bot", "feedback@zulip.com"),
]
create_users(zulip_realm, zulip_cross_realm_bots, bot_type=UserProfile.DEFAULT_BOT)
# Mark all messages as read # Mark all messages as read
UserMessage.objects.all().update(flags=UserMessage.flags.read) UserMessage.objects.all().update(flags=UserMessage.flags.read)

2
zproject/settings.py
View File

@ -283,7 +283,7 @@ DEFAULT_SETTINGS.update({
# SYSTEM_BOT_REALM would be a constant always set to 'zulip', # SYSTEM_BOT_REALM would be a constant always set to 'zulip',
# except that it isn't that on zulipchat.com. We will likely do a # except that it isn't that on zulipchat.com. We will likely do a
# migration and eliminate this parameter in the future. # migration and eliminate this parameter in the future.
'SYSTEM_BOT_REALM': 'zulip', 'SYSTEM_BOT_REALM': 'zulipinternal',
# Structurally, we will probably eventually merge # Structurally, we will probably eventually merge
# analytics into part of the main server, rather # analytics into part of the main server, rather