mirror of
https://github.com/zulip/zulip.git
synced 2025-11-10 00:46:03 +00:00
install: Remove references to "Zulip Voyager".
"Zulip Voyager" was a name invented during the Hack Week to open source Zulip for what a single-system Zulip server might be called, as a Star Trek pun on the code it was based on, "Zulip Enterprise". At the time, we just needed a name quickly, but it was never a good name, just a placeholder. This removes that placeholder name from much of the codebase. A bit more work will be required to transition the `zulip::voyager` Puppet class, as that has some migration work involved.
This commit is contained in:
committed by
Mateusz Mandera
parent
728155afee
commit
d9aa4161f8
@@ -1,6 +1,6 @@
|
|||||||
# This file is managed by puppet; local changes will be overridden.
|
# This file is managed by puppet; local changes will be overridden.
|
||||||
|
|
||||||
smtpd_banner = $myhostname ESMTP $mail_name (Zulip Voyager)
|
smtpd_banner = $myhostname ESMTP $mail_name (Zulip)
|
||||||
biff = no
|
biff = no
|
||||||
|
|
||||||
# appending .domain is the MUA's job.
|
# appending .domain is the MUA's job.
|
||||||
|
|||||||
@@ -578,7 +578,7 @@ define service {
|
|||||||
define service {
|
define service {
|
||||||
use generic-service
|
use generic-service
|
||||||
hostgroup_name staging_frontends
|
hostgroup_name staging_frontends
|
||||||
service_description Check email deliverer process which is only used on Zulip Voyager
|
service_description Check email deliverer process
|
||||||
check_command check_email_deliverer_process
|
check_command check_email_deliverer_process
|
||||||
contact_groups admins
|
contact_groups admins
|
||||||
}
|
}
|
||||||
@@ -586,7 +586,7 @@ define service {
|
|||||||
define service {
|
define service {
|
||||||
use generic-service
|
use generic-service
|
||||||
hostgroup_name staging_frontends
|
hostgroup_name staging_frontends
|
||||||
service_description Check email deliverer backlog which is only used on Zulip Voyager
|
service_description Check email deliverer backlog
|
||||||
check_command check_email_deliverer_backlog
|
check_command check_email_deliverer_backlog
|
||||||
contact_groups admins
|
contact_groups admins
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ cd "$THIS_DIR/../.."
|
|||||||
./manage.py migrate --noinput
|
./manage.py migrate --noinput
|
||||||
./manage.py createcachetable third_party_api_results
|
./manage.py createcachetable third_party_api_results
|
||||||
|
|
||||||
if ! ./manage.py initialize_voyager_db; then
|
if ! ./manage.py initialize_production_database; then
|
||||||
set +x
|
set +x
|
||||||
echo
|
echo
|
||||||
echo -e '\033[32mPopulating default database failed.'
|
echo -e '\033[32mPopulating default database failed.'
|
||||||
|
|||||||
@@ -1059,9 +1059,9 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
|
|||||||
do_change_plan_type(realm, Realm.SELF_HOSTED)
|
do_change_plan_type(realm, Realm.SELF_HOSTED)
|
||||||
return realm
|
return realm
|
||||||
|
|
||||||
# create_users and do_import_system_bots differ from their equivalent in
|
# create_users and do_import_system_bots differ from their equivalent
|
||||||
# zerver/management/commands/initialize_voyager_db.py because here we check if the bots
|
# in zerver/lib/server_initialization.py because here we check if the
|
||||||
# don't already exist and only then create a user for these bots.
|
# bots don't already exist and only then create a user for these bots.
|
||||||
def do_import_system_bots(realm: Any) -> None:
|
def do_import_system_bots(realm: Any) -> None:
|
||||||
internal_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
|
internal_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
|
||||||
for bot in settings.INTERNAL_BOTS]
|
for bot in settings.INTERNAL_BOTS]
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from django.core.management.base import BaseCommand
|
|||||||
from zerver.lib.management import check_config
|
from zerver.lib.management import check_config
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = """Checks your Zulip Voyager Django configuration for issues."""
|
help = """Checks /etc/zulip/settings.py for common configuration issues."""
|
||||||
|
|
||||||
def handle(self, *args: Any, **options: Any) -> None:
|
def handle(self, *args: Any, **options: Any) -> None:
|
||||||
check_config()
|
check_config()
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ from zerver.lib.server_initialization import create_internal_realm, server_initi
|
|||||||
settings.TORNADO_SERVER = None
|
settings.TORNADO_SERVER = None
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = "Populate an initial database for Zulip Voyager"
|
help = "Populate system realm and bots for a Zulip production server"
|
||||||
|
|
||||||
def add_arguments(self, parser: ArgumentParser) -> None:
|
def add_arguments(self, parser: ArgumentParser) -> None:
|
||||||
parser.add_argument('--extra-users',
|
parser.add_argument('--extra-users',
|
||||||
@@ -76,8 +76,7 @@ i18n_urls = [
|
|||||||
url(r'^confirmation_key/$', zerver.views.development.registration.confirmation_key),
|
url(r'^confirmation_key/$', zerver.views.development.registration.confirmation_key),
|
||||||
]
|
]
|
||||||
|
|
||||||
# These are used for voyager development. On a real voyager instance,
|
# On a production instance, these files would be served by nginx.
|
||||||
# these files would be served by nginx.
|
|
||||||
if settings.LOCAL_UPLOADS_DIR is not None:
|
if settings.LOCAL_UPLOADS_DIR is not None:
|
||||||
urls += [
|
urls += [
|
||||||
url(r'^user_avatars/(?P<path>.*)$', serve,
|
url(r'^user_avatars/(?P<path>.*)$', serve,
|
||||||
|
|||||||
@@ -545,7 +545,7 @@ AUTH_LDAP_USER_ATTR_MAP = {
|
|||||||
# Miscellaneous settings.
|
# Miscellaneous settings.
|
||||||
|
|
||||||
# The default CAMO_URI of '/external_content/' is served by the camo
|
# The default CAMO_URI of '/external_content/' is served by the camo
|
||||||
# setup in the default Voyager nginx configuration. Setting CAMO_URI
|
# setup in the default Zulip nginx configuration. Setting CAMO_URI
|
||||||
# to '' will disable the Camo integration.
|
# to '' will disable the Camo integration.
|
||||||
CAMO_URI = '/external_content/'
|
CAMO_URI = '/external_content/'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user