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

supervisor: Use 127.0.0.1 rather than localhost for tornado. 

In theory these should be the same, but in misconfigured environments
(such at Travis CI) where /etc/hosts has multiple entries for
"localhost", 127.0.0.1 is safer than "localhost".
This commit is contained in:
Tim Abbott 2016-05-07 22:43:45 -07:00
parent 52e96915e2
commit c0d38f42f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/files/supervisor/conf.d/zulip.conf
View File

@ -43,7 +43,7 @@ socket_owner=zulip:zulip
socket_mode=0700 socket_mode=0700
[program:zulip-tornado] [program:zulip-tornado]
command=python2.7 /home/zulip/deployments/current/manage.py runtornado localhost:9993 command=python2.7 /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9993
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)

2
zproject/settings.py
View File

@ -303,7 +303,7 @@ INSTALLED_APPS = [
# Base URL of the Tornado server # Base URL of the Tornado server
# We set it to None when running backend tests or populate_db. # We set it to None when running backend tests or populate_db.
# We override the port number when running frontend tests. # We override the port number when running frontend tests.
TORNADO_SERVER = 'http://localhost:9993' TORNADO_SERVER = 'http://127.0.0.1:9993'
RUNNING_INSIDE_TORNADO = False RUNNING_INSIDE_TORNADO = False
######################################################################## ########################################################################