From f79adf830f0974eb57da3d60dd631ac77ddad3a6 Mon Sep 17 00:00:00 2001 From: David Roe Date: Fri, 21 Aug 2015 00:53:11 -0700 Subject: [PATCH] deployed => production (imported from commit 2d7b0a7a73b0c84b32634a88af1e0d666139d4ff) --- api/integrations/asana/zulip_asana_config.py | 2 +- docs/code-style.rst | 2 +- docs/directory-structure.rst | 2 +- templates/zerver/portico.html | 4 ++-- zerver/context_processors.py | 2 +- zproject/local_settings.py | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/integrations/asana/zulip_asana_config.py b/api/integrations/asana/zulip_asana_config.py index 56be836dce..7219bf8d91 100644 --- a/api/integrations/asana/zulip_asana_config.py +++ b/api/integrations/asana/zulip_asana_config.py @@ -38,7 +38,7 @@ ZULIP_STREAM_NAME = "asana" ### OPTIONAL CONFIGURATION ### # Set to None for logging to stdout when testing, and to a file for -# logging when deployed. +# logging in production. #LOG_FILE = "/var/tmp/zulip_asana.log" LOG_FILE = None diff --git a/docs/code-style.rst b/docs/code-style.rst index cdea2fd549..be447e425e 100644 --- a/docs/code-style.rst +++ b/docs/code-style.rst @@ -191,7 +191,7 @@ State and logs files -------------------- Do not write state and logs files inside the current working directory -in the deployed environment. This will not work correctly, because the +in the production environment. This will not work correctly, because the current working directory for the app changes every time we do a deploy. Instead, hardcode a path when settings.py -- see SERVER\_LOG\_PATH in settings.py for an example. diff --git a/docs/directory-structure.rst b/docs/directory-structure.rst index 12291f0c09..71de8dd898 100644 --- a/docs/directory-structure.rst +++ b/docs/directory-structure.rst @@ -90,6 +90,6 @@ Documentation +-------------+-----------------------------------------------+ You can consult the code for ``tools/build-enterprise-tarball`` to -check exactly which components are deployed -- +check exactly which components are included in production -- since that is the tool that does the builds, it controls the distribution. diff --git a/templates/zerver/portico.html b/templates/zerver/portico.html index bf90172d4e..545ee713a9 100644 --- a/templates/zerver/portico.html +++ b/templates/zerver/portico.html @@ -27,7 +27,7 @@ hence the name. Log in {% endif %} - {% if deployed and not_enterprise %} + {% if zulip_com %} {% elif only_sso %} Log In {% else %} @@ -58,7 +58,7 @@ hence the name. {% if not only_sso %}
  • ยท
  • - {% if deployed and not_enterprise %} + {% if zulip_com %} {% else %} Register {% endif %} diff --git a/zerver/context_processors.py b/zerver/context_processors.py index d4b8307cf0..9812053594 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -11,7 +11,7 @@ def add_settings(request): # will render even if the appropriate context is not provided # to the template 'not_enterprise': not settings.ENTERPRISE, - 'deployed': settings.PRODUCTION, + 'zulip_com': settings.ZULIP_COM, 'zulip_admin': settings.ZULIP_ADMINISTRATOR, 'login_url': settings.HOME_NOT_LOGGED_IN, 'only_sso': settings.ONLY_SSO, diff --git a/zproject/local_settings.py b/zproject/local_settings.py index e1701938d6..99dd7cb2a5 100644 --- a/zproject/local_settings.py +++ b/zproject/local_settings.py @@ -7,15 +7,15 @@ config_file = ConfigParser.RawConfigParser() config_file.read("/etc/zulip/zulip.conf") # Whether we're running in a production environment. Note that PRODUCTION does -# **not** mean hosted by us; customer sites are PRODUCTION and ENTERPRISE -# and as such should not for example assume they are the main Zulip site. +# **not** mean hosted on Zulip.com; customer sites are PRODUCTION and ENTERPRISE +# and as such should not assume they are the main Zulip site. PRODUCTION = config_file.has_option('machine', 'deploy_type') -# The following flags are leftover from the various configurations of +# The following flags are left over from the various configurations of # Zulip run by Zulip, Inc. We will eventually be able to get rid of # them and just have the PRODUCTION flag, but we need them for now. ZULIP_COM_STAGING = PRODUCTION and config_file.get('machine', 'deploy_type') == 'staging' - +ZULIP_COM = PRODUCTION and config_file.get('machine', 'deploy_type') == 'prod' ENTERPRISE = PRODUCTION and config_file.get('machine', 'deploy_type') == 'enterprise' ZULIP_FRIENDS_LIST_ID = '84b2f3da6b'