Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Eliminate disused variable EXTERNAL_API_URI. 

This was part of the logic to handle EXTERNAL_API_PATH varying.
But also it was already no longer used -- it was only ever passed
into template contexts, as `external_api_uri`, and it'd been
overtaken there by `external_api_uri_subdomain`.

So, update our dev docs to reflect that, and eliminate the variable.
This commit is contained in:
Greg Price 2017-10-27 19:00:58 -07:00
parent aeb69dfd61
commit 271a9f0da7
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/integration-docs-guide.md
View File

@ -99,7 +99,7 @@ Here are a few common macros used to document Zulip's integrations:
* **Contents:** See [source][5]. **Note:** If special configuration is * **Contents:** See [source][5]. **Note:** If special configuration is
required to set up the URL and you can't use this macro, be sure to use the required to set up the URL and you can't use this macro, be sure to use the
`{{ external_api_uri }}` template variable, so that your integration `{{ external_api_uri_subdomain }}` template variable, so that your integration
documentation will provide the correct URL for whatever server it is documentation will provide the correct URL for whatever server it is
deployed on. If special configuration is required to set the SITE deployed on. If special configuration is required to set the SITE
variable, you should document that too. variable, you should document that too.

1
zerver/context_processors.py
View File

@ -111,7 +111,6 @@ def zulip_default_context(request):
'privacy_policy': settings.PRIVACY_POLICY, 'privacy_policy': settings.PRIVACY_POLICY,
'login_url': settings.HOME_NOT_LOGGED_IN, 'login_url': settings.HOME_NOT_LOGGED_IN,
'only_sso': settings.ONLY_SSO, 'only_sso': settings.ONLY_SSO,
'external_api_uri': settings.EXTERNAL_API_URI,
'external_host': settings.EXTERNAL_HOST, 'external_host': settings.EXTERNAL_HOST,
'external_uri_scheme': settings.EXTERNAL_URI_SCHEME, 'external_uri_scheme': settings.EXTERNAL_URI_SCHEME,
'realm_invite_required': realm_invite_required, 'realm_invite_required': realm_invite_required,

1
zproject/settings.py
View File

@ -604,7 +604,6 @@ else:
######################################################################## ########################################################################
ROOT_DOMAIN_URI = EXTERNAL_URI_SCHEME + EXTERNAL_HOST ROOT_DOMAIN_URI = EXTERNAL_URI_SCHEME + EXTERNAL_HOST
EXTERNAL_API_URI = ROOT_DOMAIN_URI + "/api"
if "NAGIOS_BOT_HOST" not in vars(): if "NAGIOS_BOT_HOST" not in vars():
NAGIOS_BOT_HOST = EXTERNAL_HOST NAGIOS_BOT_HOST = EXTERNAL_HOST