paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move apache2 restart for SSO sites to restart-server

Browse Source 
(imported from commit f999e2b0591a11442c1d3fdba2393ecf6e78bad3)
This commit is contained in:
Zev Benjamin
2013-11-14 18:40:23 -05:00
parent 7f2936a985
commit 974159ec94
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/lib/upgrade-zulip-stage-2
View File

@@ -39,8 +39,3 @@ logging.info("Restarting Zulip...")
subprocess.check_call(["cp", "-rT", os.path.join(deploy_path, 'prod-static/serve'),
'/home/zulip/prod-static'], preexec_fn=su_to_zulip)
subprocess.check_output(["./scripts/restart-server"], preexec_fn=su_to_zulip)
using_sso = subprocess.check_output(['./bin/get-django-setting', 'USING_SSO'], preexec_fn=su_to_zulip)
if using_sso:
logging.info("Restarting Apache...")
subprocess.check_call(["service", "apache2", "restart"])

5
scripts/restart-server
View File

@@ -31,5 +31,10 @@ subprocess.check_call(["supervisorctl", "stop", "zulip-workers:* zulip-django zu
subprocess.check_call(["ln", '-nsf', deploy_path, os.path.join(DEPLOYMENTS_DIR, "current")])
subprocess.check_call(["supervisorctl", "start", "zulip-tornado zulip-django zulip-workers:*"])
using_sso = subprocess.check_output(['./bin/get-django-setting', 'USING_SSO'])
if using_sso.strip() == 'True':
logging.info("Restarting Apache WSGI process...")
subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"])
logging.info("Done!")
print OKGREEN + "Application restarted successfully!" + ENDC