From e3f38acbcefd79b957414b0810a1c88ff647da67 Mon Sep 17 00:00:00 2001 From: David Roe Date: Fri, 21 Aug 2015 02:56:54 -0700 Subject: [PATCH] Enterprise => Voyager. (imported from commit 41b9a67301aeaf5fd40bbbb8f34a326ca98431fd) --- api/README.md | 6 +++--- api/integrations/asana/zulip_asana_config.py | 2 +- api/integrations/basecamp/zulip_basecamp_config.py | 2 +- api/integrations/codebase/zulip_codebase_config.py | 2 +- api/integrations/git/zulip_git_config.py | 2 +- api/integrations/svn/zulip_svn_config.py | 2 +- api/integrations/trac/zulip_trac_config.py | 2 +- api/zulip/__init__.py | 2 +- puppet/zulip/templates/postfix/main.cf.erb | 2 +- puppet/zulip_internal/files/nagios3/conf.d/services.cfg | 4 ++-- puppet/zulip_internal/files/nginx/sites-available/zulip | 2 +- scripts/setup/README | 6 +++--- zerver/management/commands/checkconfig.py | 2 +- zerver/management/commands/deliver_email.py | 2 +- zerver/management/commands/initialize_voyager_db.py | 2 +- zerver/management/commands/print_email_delivery_backlog.py | 2 +- zerver/models.py | 2 +- zproject/local_settings_template.py | 4 ++-- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/api/README.md b/api/README.md index cc0857bb0d..652ea4232d 100644 --- a/api/README.md +++ b/api/README.md @@ -31,14 +31,14 @@ file is as follows: key= email= -If you are using Zulip Enterprise, you should also add +If you are using Zulip Voyager, you should also add - site= + site= Alternatively, you may explicitly use "--user" and "--api-key" in our examples, which is especially useful if you are running several bots which share a home directory. There is also a "--site" option for -setting the Zulip Enterprise server on the command line. +setting the Zulip Voyager server on the command line. You can obtain your Zulip API key, create bots, and manage bots all from your Zulip [settings page](https://zulip.com/#settings). diff --git a/api/integrations/asana/zulip_asana_config.py b/api/integrations/asana/zulip_asana_config.py index 7219bf8d91..971309e444 100644 --- a/api/integrations/asana/zulip_asana_config.py +++ b/api/integrations/asana/zulip_asana_config.py @@ -49,7 +49,7 @@ RESUME_FILE = "/var/tmp/zulip_asana.state" # When initially started, how many hours of messages to include. ASANA_INITIAL_HISTORY_HOURS = 1 -# If you're using Zulip Enterprise, set this to your Zulip Enterprise server +# If you're using Zulip Voyager, set this to your Zulip Voyager server ZULIP_SITE = "https://api.zulip.com" # If properly installed, the Zulip API should be in your import diff --git a/api/integrations/basecamp/zulip_basecamp_config.py b/api/integrations/basecamp/zulip_basecamp_config.py index baadc699a8..28fccbe04c 100644 --- a/api/integrations/basecamp/zulip_basecamp_config.py +++ b/api/integrations/basecamp/zulip_basecamp_config.py @@ -41,7 +41,7 @@ ZULIP_STREAM_NAME = "basecamp" ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Enterprise, set this to your Zulip Enterprise server +# If you're using Zulip Voyager, set this to your Zulip Voyager server ZULIP_SITE = "https://api.zulip.com" # If you wish to log to a file rather than stdout/stderr, diff --git a/api/integrations/codebase/zulip_codebase_config.py b/api/integrations/codebase/zulip_codebase_config.py index 8f3333cc33..69f303eb11 100644 --- a/api/integrations/codebase/zulip_codebase_config.py +++ b/api/integrations/codebase/zulip_codebase_config.py @@ -50,7 +50,7 @@ ZULIP_TICKETS_STREAM_NAME = "tickets" # path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Enterprise, set this to your Zulip Enterprise server +# If you're using Zulip Voyager, set this to your Zulip Voyager server ZULIP_SITE = "https://api.zulip.com" # If you wish to log to a file rather than stdout/stderr, diff --git a/api/integrations/git/zulip_git_config.py b/api/integrations/git/zulip_git_config.py index 2000fd7bce..37caf6365d 100644 --- a/api/integrations/git/zulip_git_config.py +++ b/api/integrations/git/zulip_git_config.py @@ -61,5 +61,5 @@ def format_commit_message(author, subject, commit_id): ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Enterprise, set this to your Zulip Enterprise server +# If you're using Zulip Voyager, set this to your Zulip Voyager server ZULIP_SITE = "https://api.zulip.com" diff --git a/api/integrations/svn/zulip_svn_config.py b/api/integrations/svn/zulip_svn_config.py index 195fa841a3..45c2c6bbaf 100644 --- a/api/integrations/svn/zulip_svn_config.py +++ b/api/integrations/svn/zulip_svn_config.py @@ -53,5 +53,5 @@ def commit_notice_destination(path, commit): ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Enterprise, set this to your Zulip Enterprise server +# If you're using Zulip Voyager, set this to your Zulip Voyager server ZULIP_SITE = "https://api.zulip.com" diff --git a/api/integrations/trac/zulip_trac_config.py b/api/integrations/trac/zulip_trac_config.py index 176f04a008..20eaff0843 100644 --- a/api/integrations/trac/zulip_trac_config.py +++ b/api/integrations/trac/zulip_trac_config.py @@ -47,5 +47,5 @@ TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", "owner" ## path, but if not, set a custom path below ZULIP_API_PATH = None -# If you're using Zulip Enterprise, set this to your Zulip Enterprise server +# If you're using Zulip Voyager, set this to your Zulip Voyager server ZULIP_SITE = "https://api.zulip.com" diff --git a/api/zulip/__init__.py b/api/zulip/__init__.py index bca2c0225f..bdfae31e67 100644 --- a/api/zulip/__init__.py +++ b/api/zulip/__init__.py @@ -97,7 +97,7 @@ def generate_option_group(parser, prefix=''): group = optparse.OptionGroup(parser, 'Zulip API configuration') group.add_option('--%ssite' % (prefix,), dest="zulip_site", - help="Zulip Enterprise server URI (if using Zulip Enterprise)", + help="Zulip Voyager server URI (if using Zulip Voyager)", default=None) group.add_option('--%sapi-key' % (prefix,), dest="zulip_api_key", diff --git a/puppet/zulip/templates/postfix/main.cf.erb b/puppet/zulip/templates/postfix/main.cf.erb index f8481b8da2..953fc8f64c 100644 --- a/puppet/zulip/templates/postfix/main.cf.erb +++ b/puppet/zulip/templates/postfix/main.cf.erb @@ -1,6 +1,6 @@ # This file is managed by puppet; local changes will be overridden. -smtpd_banner = $myhostname ESMTP $mail_name (Zulip Enterprise) +smtpd_banner = $myhostname ESMTP $mail_name (Zulip Voyager) biff = no # appending .domain is the MUA's job. diff --git a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg index 30f7adcf92..b1828204bf 100644 --- a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg +++ b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg @@ -446,7 +446,7 @@ define service { define service { use generic-service host staging - service_description Check email deliverer process which is only used on Zulip Enterprise + service_description Check email deliverer process which is only used on Zulip Voyager check_command check_email_deliverer_process contact_groups admins } @@ -454,7 +454,7 @@ define service { define service { use generic-service host staging - service_description Check email deliverer backlog which is only used on Zulip Enterprise + service_description Check email deliverer backlog which is only used on Zulip Voyager check_command check_email_deliverer_backlog contact_groups admins } diff --git a/puppet/zulip_internal/files/nginx/sites-available/zulip b/puppet/zulip_internal/files/nginx/sites-available/zulip index 6b7e8323f1..b2597e3167 100644 --- a/puppet/zulip_internal/files/nginx/sites-available/zulip +++ b/puppet/zulip_internal/files/nginx/sites-available/zulip @@ -60,7 +60,7 @@ server { alias /srv/www/dist/; } - # Enterprise downloads + # Voyager downloads location /enterprise/ { alias /srv/www/enterprise/; autoindex on; diff --git a/scripts/setup/README b/scripts/setup/README index 2fb865d3ba..9ad00d7a8d 100644 --- a/scripts/setup/README +++ b/scripts/setup/README @@ -16,7 +16,7 @@ Requirements: ======================================================================= -How to install Zulip Enterprise: +How to install Zulip Voyager: These instructions should be followed as root. @@ -91,7 +91,7 @@ login via the SSO solution. ======================================================================= -Maintaining Zulip Enterprise: +Maintaining Zulip Voyager: * To upgrade to a new version, download the appropriate tarball from https://zulip.com/enterprise/download, and then run @@ -112,7 +112,7 @@ Maintaining Zulip Enterprise: a regular basis to ensure that it is up to date with the latest security patches. -* To use the Zulip API with Zulip Enterprise, you will need to use the +* To use the Zulip API with Zulip Voyager, you will need to use the API endpoint of e.g. "https://zulip.yourdomain.net/api". Our Python API examples support this via the "--site=https://zulip.yourdomain.net" argument. The API bindings diff --git a/zerver/management/commands/checkconfig.py b/zerver/management/commands/checkconfig.py index 948150ee53..d923341bdc 100644 --- a/zerver/management/commands/checkconfig.py +++ b/zerver/management/commands/checkconfig.py @@ -7,7 +7,7 @@ from django.conf import settings import sys class Command(BaseCommand): - help = """Checks your Zulip Enterprise Django configuration for issues.""" + help = """Checks your Zulip Voyager Django configuration for issues.""" option_list = BaseCommand.option_list + () def handle(self, **options): diff --git a/zerver/management/commands/deliver_email.py b/zerver/management/commands/deliver_email.py index 9f5681256d..442d3a854a 100755 --- a/zerver/management/commands/deliver_email.py +++ b/zerver/management/commands/deliver_email.py @@ -63,7 +63,7 @@ def send_email_job(job): class Command(BaseCommand): help = """Deliver emails queued by various parts of Zulip (either for immediate sending or sending at a specified time). -Run this command under supervisor. We use Mandrill for our deploy; this is for Zulip Enterprise deploys. +Run this command under supervisor. We use Mandrill for our deploy; this is for Zulip Voyager deploys. Usage: python manage.py deliver_email """ diff --git a/zerver/management/commands/initialize_voyager_db.py b/zerver/management/commands/initialize_voyager_db.py index 6a0e646257..7cfc61ac53 100644 --- a/zerver/management/commands/initialize_voyager_db.py +++ b/zerver/management/commands/initialize_voyager_db.py @@ -25,7 +25,7 @@ def create_users(name_list, bot=False): bulk_create_users(realms, user_set, bot) class Command(BaseCommand): - help = "Populate an initial database for Zulip Enterprise" + help = "Populate an initial database for Zulip Voyager" option_list = BaseCommand.option_list + ( make_option('--extra-users', diff --git a/zerver/management/commands/print_email_delivery_backlog.py b/zerver/management/commands/print_email_delivery_backlog.py index c46d1aab92..6bd24914d6 100755 --- a/zerver/management/commands/print_email_delivery_backlog.py +++ b/zerver/management/commands/print_email_delivery_backlog.py @@ -18,7 +18,7 @@ class Command(BaseCommand): (The number of currently overdue (by at least a minute) email jobs) This is run as part of the nagios health check for the deliver_email command. -Please note that this is only currently useful for Zulip Enterprise deploys. +Please note that this is only currently useful for Zulip Voyager deploys. Usage: python manage.py print_email_delivery_backlog """ diff --git a/zerver/models.py b/zerver/models.py index b1e4609de0..41f369974c 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -1261,7 +1261,7 @@ class Referral(models.Model): email = models.EmailField(blank=False, null=False) timestamp = models.DateTimeField(auto_now_add=True, null=False) -# This table only gets used on Zulip Enterprise instances +# This table only gets used on Zulip Voyager instances # For reasons of deliverability (and sending from multiple email addresses), # we will still send from mandrill when we send things from the (staging.)zulip.com install class ScheduledJob(models.Model): diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py index 900e57e016..8cd8667eb9 100644 --- a/zproject/local_settings_template.py +++ b/zproject/local_settings_template.py @@ -1,4 +1,4 @@ -# Settings for Zulip Enterprise +# Settings for Zulip Voyager ### MANDATORY SETTINGS @@ -7,7 +7,7 @@ EXTERNAL_HOST = '' # The email address for the person or team who maintain the Zulip -# Enterprise installation. Will also get support emails. (e.g. zulip-admin@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