From 3f7cb34b006451e3c51e0478ebfe565697bbb700 Mon Sep 17 00:00:00 2001 From: David Roe Date: Fri, 21 Aug 2015 02:48:43 -0700 Subject: [PATCH] enterprise => voyager (imported from commit 04be792bb480d5e5db1c91d296d1000cf1682571) --- confirmation/views.py | 2 +- docs/directory-structure.rst | 4 ++-- provision.py | 2 +- scripts/lib/install | 4 ++-- ...rprise_secrets.py => generate_voyager_secrets.py} | 0 scripts/setup/initialize-database | 2 +- static/js/feature_flags.js | 4 ++-- templates/confirmation/confirm.html | 2 +- templates/confirmation/invite_email_body.txt | 2 +- templates/confirmation/mituser_invite_email_body.txt | 2 +- .../preregistrationuser_confirmation_email_body.txt | 2 +- templates/zerver/apps.html | 12 ++++++------ templates/zerver/base.html | 2 +- templates/zerver/emails/followup/day1.html | 6 +----- templates/zerver/emails/followup/day1.text | 6 +----- templates/zerver/emails/followup/day2.html | 4 ---- templates/zerver/emails/followup/day2.text | 5 +---- .../emails/invitation/invitation_reminder_email.html | 2 +- .../emails/invitation/invitation_reminder_email.text | 2 +- templates/zerver/hello.html | 4 ++-- templates/zerver/register.html | 2 +- ...uild-enterprise-tarball => build-voyager-tarball} | 2 +- zerver/context_processors.py | 4 ++-- zerver/lib/actions.py | 2 +- zerver/lib/notifications.py | 6 +++--- zerver/management/commands/create_realm.py | 2 +- zerver/management/commands/email-mirror.py | 2 +- ...ize_enterprise_db.py => initialize_voyager_db.py} | 0 zerver/views/__init__.py | 4 ++-- zerver/worker/queue_processors.py | 2 +- zproject/backends.py | 2 +- zproject/urls.py | 2 +- 32 files changed, 42 insertions(+), 57 deletions(-) rename scripts/setup/{generate_enterprise_secrets.py => generate_voyager_secrets.py} (100%) rename tools/{build-enterprise-tarball => build-voyager-tarball} (98%) rename zerver/management/commands/{initialize_enterprise_db.py => initialize_voyager_db.py} (100%) diff --git a/confirmation/views.py b/confirmation/views.py index b1e547a1ad..ea8fed825f 100644 --- a/confirmation/views.py +++ b/confirmation/views.py @@ -31,7 +31,7 @@ def confirm(request, confirmation_key): 'key': confirmation_key, 'full_name': request.GET.get("full_name", None), 'support_email': settings.ZULIP_ADMINISTRATOR, - 'enterprise': settings.VOYAGER + 'voyager': settings.VOYAGER } templates = [ 'confirmation/confirm.html', diff --git a/docs/directory-structure.rst b/docs/directory-structure.rst index 71de8dd898..db638d2f3d 100644 --- a/docs/directory-structure.rst +++ b/docs/directory-structure.rst @@ -3,7 +3,7 @@ Directory structure =================== .. attention:: - ``tools/build-enterprise-tarball`` needs a new name. (``build-server-tarball``?) + does ``tools/build-voyager-tarball`` need a different name? This page documents our directory structure and how to decide where to put a file. @@ -89,7 +89,7 @@ Documentation | ``docs/`` | Source for this documentation | +-------------+-----------------------------------------------+ -You can consult the code for ``tools/build-enterprise-tarball`` to +You can consult the code for ``tools/build-voyager-tarball`` to check exactly which components are included in production -- since that is the tool that does the builds, it controls the distribution. diff --git a/provision.py b/provision.py index f1292e14fb..4096e314a0 100644 --- a/provision.py +++ b/provision.py @@ -145,7 +145,7 @@ def main(): # Management commands expect to be run from the root of the project. os.chdir(ZULIP_PATH) - os.system("generate_enterprise_secrets.py -d") + os.system("generate_voyager_secrets.py -d") sh.configure_rabbitmq(**LOUD) sh.postgres_init_db(**LOUD) sh.do_destroy_rebuild_database(**LOUD) diff --git a/scripts/lib/install b/scripts/lib/install index 12490ba93c..76af641e67 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -15,7 +15,7 @@ apt-get install -y puppet git cp -a /root/zulip/puppet/zulip/files/puppet.conf /etc/puppet/ mkdir -p /etc/zulip -echo -e "[machine]\npuppet_classes = zulip::enterprise\ndeploy_type = enterprise" > /etc/zulip/zulip.conf +echo -e "[machine]\npuppet_classes = zulip::enterprise\ndeploy_type = voyager" > /etc/zulip/zulip.conf /root/zulip/scripts/zulip-puppet-apply -f # These server restarting bits should be moveable into puppet-land, ideally @@ -24,7 +24,7 @@ if [ -e "/etc/init.d/nginx" ]; then service nginx restart fi -/root/zulip/scripts/setup/generate_enterprise_secrets.py +/root/zulip/scripts/setup/generate_voyager_secrets.py mv /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py diff --git a/scripts/setup/generate_enterprise_secrets.py b/scripts/setup/generate_voyager_secrets.py similarity index 100% rename from scripts/setup/generate_enterprise_secrets.py rename to scripts/setup/generate_voyager_secrets.py diff --git a/scripts/setup/initialize-database b/scripts/setup/initialize-database index 63d9fa57c3..915ad701e9 100755 --- a/scripts/setup/initialize-database +++ b/scripts/setup/initialize-database @@ -13,6 +13,6 @@ python manage.py checkconfig python manage.py migrate --noinput python manage.py createcachetable third_party_api_results -python manage.py initialize_enterprise_db +python manage.py initialize_voyager_db supervisorctl restart all diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js index 9da780eb5f..16584ea7de 100644 --- a/static/js/feature_flags.js +++ b/static/js/feature_flags.js @@ -11,8 +11,8 @@ var customer4_realms = [ ]; var is_customer4 = _.contains(customer4_realms, page_params.domain); -// Enterprise-related flags -exports.do_not_share_the_love = page_params.enterprise; +// Voyager-related flags +exports.do_not_share_the_love = page_params.voyager; // Manually-flipped debugging flags exports.log_send_times = false; diff --git a/templates/confirmation/confirm.html b/templates/confirmation/confirm.html index 397ab7db70..088afda934 100644 --- a/templates/confirmation/confirm.html +++ b/templates/confirmation/confirm.html @@ -10,7 +10,7 @@

Whoops, something's not right. We couldn't find your confirmation ID!

- {% if enterprise %} + {% if voyager %}

Make sure you copied the link correctly in to your browser.

If you're still having problems, please contact your Zulip administrator at -{% if enterprise %} +{% if voyager %} If you are having issues, please contact your Zulip administrator at <{{ support_email }}>. {% else %} Feel free to give us a shout at <{{ support_email }}> if you have any questions. diff --git a/templates/confirmation/mituser_invite_email_body.txt b/templates/confirmation/mituser_invite_email_body.txt index b9d999bd2d..634514cc1c 100644 --- a/templates/confirmation/mituser_invite_email_body.txt +++ b/templates/confirmation/mituser_invite_email_body.txt @@ -5,7 +5,7 @@ Hi there, To get started, visit the link below: <{{ activate_url }}> -{% if enterprise %} +{% if voyager %} If you are having issues, please contact your Zulip administrator at <{{ support_email }}>. {% else %} Feel free to give us a shout at <{{ support_email }}> if you have any questions. diff --git a/templates/confirmation/preregistrationuser_confirmation_email_body.txt b/templates/confirmation/preregistrationuser_confirmation_email_body.txt index 868b2bbeec..9c1db3d86c 100644 --- a/templates/confirmation/preregistrationuser_confirmation_email_body.txt +++ b/templates/confirmation/preregistrationuser_confirmation_email_body.txt @@ -5,7 +5,7 @@ You recently signed up for Zulip. Awesome! To complete signup, visit this link below: <{{ activate_url }}> -{% if enterprise %} +{% if voyager %} If you are having issues, please contact your Zulip administrator at <{{ support_email }}>. {% else %} Feel free to give us a shout at <{{ support_email }}> if you have any questions. diff --git a/templates/zerver/apps.html b/templates/zerver/apps.html index f2c9232d41..df920c6208 100644 --- a/templates/zerver/apps.html +++ b/templates/zerver/apps.html @@ -8,7 +8,7 @@

Installation instructions

- {% if not_enterprise %} + {% if not_voyager %}
screenshot of the Zulip app on Android @@ -54,7 +54,7 @@ emacs, or Photoshop.

- {% if not_enterprise %} + {% if not_voyager %} Download Zulip for Mac {% else %} Download Zulip for Mac @@ -75,7 +75,7 @@ cat user-apt.asc | sudo apt-key add - sudo apt-add-repository http://apt.zulip.com/user/ sudo apt-get update -{% if not_enterprise %} +{% if not_voyager %} sudo apt-get install zulip-desktop {% else %} sudo apt-get install zulip-desktop-sso @@ -84,7 +84,7 @@ sudo apt-get install zulip-desktop-sso

Other

- {% if not_enterprise %} + {% if not_voyager %}

We provide a binary tarball of the Zulip application, built for 64-bit systems.

{% else %} @@ -102,7 +102,7 @@ sudo apt-get install zulip-desktop-sso Solitaire, obviously.)

- {% if not_enterprise %} + {% if not_voyager %} Download Zulip for Windows {% else %} Download Zulip for Windows diff --git a/templates/zerver/base.html b/templates/zerver/base.html index 62318f050d..18d1748d1d 100644 --- a/templates/zerver/base.html +++ b/templates/zerver/base.html @@ -20,7 +20,7 @@ - {% if not_enterprise %} + {% if not_voyager %} {% endif %} diff --git a/templates/zerver/emails/followup/day1.html b/templates/zerver/emails/followup/day1.html index b76c68c5b3..70076fc19f 100644 --- a/templates/zerver/emails/followup/day1.html +++ b/templates/zerver/emails/followup/day1.html @@ -33,15 +33,11 @@

  • Emoji. Because 
    :ramen:
    means .
    • -{% if not_enterprise %} +{% if not_voyager %}

    Zulip has a team of engineers standing by to respond to your feedback, so please let us know what you think! Click the "Send feedback" button inside Zulip, or just reply to this email.

    {% endif %} -{% if not_enterprise %} -

    - Waseem, for the Zulip team

    -{% else %}

    Thanks,
    Zulip

    -{% endif %} diff --git a/templates/zerver/emails/followup/day1.text b/templates/zerver/emails/followup/day1.text index 383dcc6f9f..ed6b5d95c6 100644 --- a/templates/zerver/emails/followup/day1.text +++ b/templates/zerver/emails/followup/day1.text @@ -16,15 +16,11 @@ https://{{ external_host }}/hello has a nice overview of what we're up to, but h 5. Are you a keyboard power user? Learn about keyboard shortcuts in the Keyboard Shortcuts tab under the gear icon. (Or press '?') 6. Emoji. Because :ramen: -{% if not_enterprise %} +{% if not_voyager %} Zulip has a team of engineers standing by to respond to your feedback, so please let us know what you think! Click the "Send feedback" button inside Zulip, or just reply to this email. {% endif %} -{% if not_enterprise %} -- Waseem, for the Zulip team -{% else %} Thanks, Zulip -{% endif %} ---- Manage email preferences: https://{{ external_host }}/#settings diff --git a/templates/zerver/emails/followup/day2.html b/templates/zerver/emails/followup/day2.html index d7a15d0719..79e894b8f3 100644 --- a/templates/zerver/emails/followup/day2.html +++ b/templates/zerver/emails/followup/day2.html @@ -28,11 +28,7 @@

    Take it for a spin now.

    -{% if not_enterprise %} -

    - Waseem, for the Zulip team

    -{% else %}

    Thanks,
    Zulip

    -{% endif %} diff --git a/templates/zerver/emails/followup/day2.text b/templates/zerver/emails/followup/day2.text index 66bae74842..de645f78e0 100644 --- a/templates/zerver/emails/followup/day2.text +++ b/templates/zerver/emails/followup/day2.text @@ -12,12 +12,9 @@ Why bother with topics? Well, two reasons: it makes conversations clearer (imagi Take it for a spin now: https://{{ external_host }} -{% if not_enterprise %} -- Waseem, for the Zulip team -{% else %} + Thanks, Zulip -{% endif %} ---- Manage email preferences: https://{{ external_host }}/#settings diff --git a/templates/zerver/emails/invitation/invitation_reminder_email.html b/templates/zerver/emails/invitation/invitation_reminder_email.html index bbf386ef9b..81ad123dae 100644 --- a/templates/zerver/emails/invitation/invitation_reminder_email.html +++ b/templates/zerver/emails/invitation/invitation_reminder_email.html @@ -28,7 +28,7 @@
    {{ activate_url }}

    - {% if enterprise %} + {% if voyager %}

    If you are having issues, please contact your Zulip administrator at {{ support_email }}.

    diff --git a/templates/zerver/emails/invitation/invitation_reminder_email.text b/templates/zerver/emails/invitation/invitation_reminder_email.text index 34c435203a..e20cb80fc6 100644 --- a/templates/zerver/emails/invitation/invitation_reminder_email.text +++ b/templates/zerver/emails/invitation/invitation_reminder_email.text @@ -5,7 +5,7 @@ This is a friendly reminder that {{ referrer.full_name }} ({{ referrer.email }}) To get started, visit the link below: <{{ activate_url }}> -{% if enterprise %} +{% if voyager %} If you are having issues, please contact your Zulip administrator at <{{ support_email }}>. {% else %} We're here for you at <{{ support_email }}>, if you have any questions. diff --git a/templates/zerver/hello.html b/templates/zerver/hello.html index b2f2be5871..0e6c100761 100644 --- a/templates/zerver/hello.html +++ b/templates/zerver/hello.html @@ -10,7 +10,7 @@ Finally, workplace chat that actually improves your productivity.* * It's also great for sharing cat pictures. - {% if not_enterprise %} + {% if not_voyager %} {% elif only_sso %} {% else %} @@ -175,7 +175,7 @@
    - {% if not_enterprise %} + {% if not_voyager %} {% elif only_sso %} {% else %} diff --git a/templates/zerver/register.html b/templates/zerver/register.html index f4bfa7ba1f..8d3d05bff5 100644 --- a/templates/zerver/register.html +++ b/templates/zerver/register.html @@ -75,7 +75,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser {% endif %} - {% if not_enterprise %} + {% if not_voyager %}