Clean up EXTERNAL_API_HOST usage and defaults.

We now have 2 variablse:
EXTERNAL_API_PATH: e.g. staging.zulip.com/api
EXTERNAL_API_URI: e.g. https://staging.zulip.com/api

The former is primarily needed for certain integrations.

(imported from commit 3878b99a4d835c5fcc2a2c6001bc7eeeaf4c9363)

puppet/zulip_internal/files/nagios_plugins/check_send_receive_time

@@ -99,11 +99,10 @@ if "staging" in options.site and settings.NAGIOS_STAGING_SEND_BOT is not None an
     settings.NAGIOS_STAGING_RECEIVE_BOT is not None:
     sender = get_user_profile_by_email(settings.NAGIOS_STAGING_SEND_BOT)
     recipient = get_user_profile_by_email(settings.NAGIOS_STAGING_RECEIVE_BOT)
-    site = "https://staging.zulip.com"
 else:
     sender = get_user_profile_by_email(settings.NAGIOS_SEND_BOT)
     recipient = get_user_profile_by_email(settings.NAGIOS_RECEIVE_BOT)
-    site = settings.EXTERNAL_API_HOST
+site = settings.EXTERNAL_API_URI
 
 zulip_sender = zulip.Client(
     email=sender.email,

zerver/management/commands/email-mirror.py

@@ -67,12 +67,12 @@ if settings.DEPLOYED:
 
 
     api_client = zulip.Client(
-            site=settings.EXTERNAL_API_HOST,
+            site=settings.EXTERNAL_API_URI,
             email=settings.EMAIL_GATEWAY_BOT,
             api_key=api_key)
 else:
     api_client = prod_api_client = zulip.Client(
-            site=settings.EXTERNAL_API_HOST,
+            site=settings.EXTERNAL_API_URI,
             email=settings.EMAIL_GATEWAY_BOT,
             api_key=api_key)
 

zproject/local_settings.py

@@ -65,18 +65,20 @@ NOREPLY_EMAIL_ADDRESS = "noreply@zulip.com"
 
 SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
 
+if DEPLOYED:
+    EXTERNAL_URI_SCHEME = "https://"
+else:
+    EXTERNAL_URI_SCHEME = "http://"
+
 if TESTING_DEPLOYED:
     EXTERNAL_HOST = platform.node()
-    EXTERNAL_API_HOST = 'https://%s/api' % (platform.node())
 elif STAGING_DEPLOYED:
     EXTERNAL_HOST = 'staging.zulip.com'
-    EXTERNAL_API_HOST = 'https://staging.zulip.com/api'
 elif DEPLOYED:
     EXTERNAL_HOST = 'zulip.com'
-    EXTERNAL_API_HOST = 'https://api.zulip.com'
 else:
     EXTERNAL_HOST = 'localhost:9991'
-    EXTERNAL_API_HOST = 'http://localhost:9991/api'
+    EXTERNAL_API_PATH = 'localhost:9991/api'
 
 EMBEDLY_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 

zproject/settings.py

@@ -296,6 +296,10 @@ REQUIRED_SETTINGS = [("EXTERNAL_HOST", ""),
                      ("DEFAULT_FROM_EMAIL", ""),
                      ]
 
+if "EXTERNAL_API_PATH" not in vars():
+    EXTERNAL_API_PATH = EXTERNAL_HOST + "/api"
+EXTERNAL_API_URI = EXTERNAL_URI_SCHEME + EXTERNAL_API_PATH
+
 INTERNAL_BOTS = [ {'var_name': 'NOTIFICATION_BOT',
                    'email_template': 'notification-bot@%s',
                    'name': 'Notification Bot'},