paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename USING_SSO to something more clear.

Browse Source 
(imported from commit 94e8ae84b01419783872a5d09bafe5c2eb933c18)
This commit is contained in:
Tim Abbott
2015-08-18 19:36:24 -07:00
parent 05b0cbb36a
commit 5b8894cd25
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/restart-server
View File

@@ -36,7 +36,7 @@ subprocess.check_call(["supervisorctl", "start", "zulip-tornado zulip-django zul
logging.info("Starting workers") logging.info("Starting workers")
subprocess.check_call(["supervisorctl", "start", "zulip-workers:*"]) subprocess.check_call(["supervisorctl", "start", "zulip-workers:*"])
using_sso = subprocess.check_output(['./bin/get-django-setting', 'USING_SSO']) using_sso = subprocess.check_output(['./bin/get-django-setting', 'USING_APACHE_SSO'])
if using_sso.strip() == 'True': if using_sso.strip() == 'True':
logging.info("Restarting Apache WSGI process...") logging.info("Restarting Apache WSGI process...")
subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"]) subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"])

2
zproject/settings.py
View File

@@ -800,7 +800,7 @@ TUTORIAL_ENABLED = True
ZULIP_IOS_APP_ID = 'com.zulip.Zulip' ZULIP_IOS_APP_ID = 'com.zulip.Zulip'
DBX_IOS_APP_ID = 'com.dropbox.Zulip' DBX_IOS_APP_ID = 'com.dropbox.Zulip'
USING_SSO = ('zproject.backends.ZulipRemoteUserBackend' in AUTHENTICATION_BACKENDS) USING_APACHE_SSO = ('zproject.backends.ZulipRemoteUserBackend' in AUTHENTICATION_BACKENDS)
if (len(AUTHENTICATION_BACKENDS) == 1 and if (len(AUTHENTICATION_BACKENDS) == 1 and
AUTHENTICATION_BACKENDS[0] == "zproject.backends.ZulipRemoteUserBackend"): AUTHENTICATION_BACKENDS[0] == "zproject.backends.ZulipRemoteUserBackend"):