adding default host var for gunicorn

playbooks/roles/discern/defaults/main.yml

@@ -10,5 +10,6 @@ nltk_data_dir: /usr/share/nltk_data
 ease_branch: master
 discern_branch: dev
 discern_gunicorn_port: 8070
+discern_gunicorn_host: 127.0.0.1
 discern_user: discern
 site_name: discern

playbooks/roles/discern/templates/discern.conf.j2

@@ -12,10 +12,11 @@ respawn limit 3 30
 env PID=/var/run/gunicorn/discern.pid
 env WORKERS={{ ansible_processor_cores * 2 }}
 env PORT={{ discern_gunicorn_port }}
+env ADDRESS={{ discern_gunicorn_host }}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE={{discern_settings}}
 
 chdir {{discern_dir}}
 setuid {{discern_user}}
 
-exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=30 --pythonpath={{discern_dir}} discern.wsgi
+exec {{venv_dir}}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=30 --pythonpath={{discern_dir}} discern.wsgi

playbooks/roles/edxapp/defaults/main.yml

@@ -238,10 +238,13 @@ lms_preview_env_config:
 edx_platform_code_dir: "{{ app_base_dir }}/edx-platform"
 
 
-# gunicorn ports, these shouldn't need to be overridden
+# gunicorn ports/hosts, these shouldn't need to be overridden
 edxapp_cms_gunicorn_port: 8010
+edxapp_cms_gunicorn_host: 127.0.0.1
 edxapp_lms_gunicorn_port: 8000
+edxapp_lms_gunicorn_host: 127.0.0.1
 edxapp_lms_preview_gunicorn_port: 8020
+edxapp_lms_preview_gunicorn_host: 127.0.0.1
 
 
 

playbooks/roles/edxapp/templates/cms.conf.j2

@@ -17,7 +17,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.cms }}
 env WORKERS={{ worker_core_mult.cms }}
 {% endif %}
 env PORT={{edxapp_cms_gunicorn_port}}
-env ADDRESS={{edxapp_cms_app_address}}
+env ADDRESS={{edxapp_cms_gunicorn_host}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=cms.envs.aws
 env SERVICE_VARIANT="cms"

playbooks/roles/edxapp/templates/lms-preview.conf.j2

@@ -18,7 +18,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms_preview }}
 env WORKERS={{ worker_core_mult.lms_preview }}
 {% endif %}
 env PORT={{edxapp_lms_preview_gunicorn_port}}
-env ADDRESS={{edxapp_lms_preview_app_address}}
+env ADDRESS={{edxapp_lms_preview_gunicorn_host}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws
 env SERVICE_VARIANT="lms-preview"

playbooks/roles/edxapp/templates/lms.conf.j2

@@ -15,7 +15,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms }}
 env WORKERS={{ worker_core_mult.lms }}
 {% endif %}
 env PORT={{edxapp_lms_gunicorn_port}}
-env ADDRESS={{edxapp_lms_app_address}}
+env ADDRESS={{edxapp_lms_gunicorn_host}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE={{ edxapp_lms_env }}
 env SERVICE_VARIANT="lms"

playbooks/roles/nginx/templates/cms.j2

 upstream cms-backend {
     # For a TCP configuration:
-    server 127.0.0.1:{{ edxapp_cms_gunicorn_port }} fail_timeout=0;
+    server {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/lms-preview.j2

 upstream lms-preview-backend {
     # For a TCP configuration:
-    server 127.0.0.1:{{ edxapp_lms_preview_gunicorn_port }} fail_timeout=0;
+    server {{ edxapp_lms_preview_gunicorn_host }}:{{ edxapp_lms_preview_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/lms.j2

 upstream lms-backend {
     # For a TCP configuration:
-    server 127.0.0.1:{{ edxapp_lms_gunicorn_port }} fail_timeout=0;
+    server {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/ora.j2

 upstream app_server {
     # For a TCP configuration:
-    server 127.0.0.1:{{ ora_gunicorn_port }} fail_timeout=0;
+    server {{ ora_gunicorn_host }}:{{ ora_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/xqueue.j2

 upstream xqueue_app_server {
     # For a TCP configuration:
-    server 127.0.0.1:{{ xqueue_gunicorn_port }} fail_timeout=0;
+    server {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/xserver.j2

@@ -10,7 +10,7 @@
 ##
 upstream xserver_app_server {
     # For a TCP configuration:
-    server 127.0.0.1:{{ xserver_gunicorn_port }} fail_timeout=0;
+    server {{ xserver_gunicorn_host }}:{{ xserver_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/ora/defaults/main.yml

@@ -13,6 +13,7 @@ ora_venv_dir: "{{ ora_user_home }}/virtualenvs/{{ ora_user }}"
 ease_venv_dir: "{{ ora_venv_dir }}"
 ora_gunicorn_workers: 4
 ora_gunicorn_port: 8060
+ora_gunicorn_host: 127.0.0.1
 
 # ora_env_config and ora_auth_config
 # should be overridden for your

playbooks/roles/ora/templates/edx-ora.conf.j2

@@ -12,6 +12,7 @@ respawn limit 3 30
 env PID=/var/run/gunicorn/edx-ora.pid
 env WORKERS={{ ora_gunicorn_workers }}
 env PORT={{ ora_gunicorn_port }}
+env ADDRESS={{ ora_gunicorn_host }}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=edx_ora.aws
 env SERVICE_VARIANT=ora
@@ -22,4 +23,4 @@ end script
 chdir {{ ora_code_dir }}
 setuid {{ ora_user }}
 
-exec {{ ora_venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=90 --pythonpath={{ ora_code_dir}} edx_ora.wsgi
+exec {{ ora_venv_dir}}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=90 --pythonpath={{ ora_code_dir}} edx_ora.wsgi

playbooks/roles/xqueue/defaults/main.yml

@@ -11,6 +11,7 @@ xqueue_code_dir: "{{ app_base_dir }}/xqueue"
 # to serve all content on port 80
 xqueue_code_dir: "{{ app_base_dir }}/xqueue"
 xqueue_gunicorn_port: 8040
+xqueue_gunicorn_host: 127.0.0.1
 
 xqueue_user: "xqueue"
 xqueue_user_home: "/opt/xqueue"

playbooks/roles/xqueue/templates/xqueue.conf.j2

@@ -13,6 +13,7 @@ env WORKERS={{ ansible_processor|length * 2 }}
 env WORKERS=2
 {% endif %}
 env PORT={{ xqueue_gunicorn_port }}
+env ADDRESS={{ xqueue_gunicorn_host }}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=xqueue.aws_settings
 env SERVICE_VARIANT="xqueue"
@@ -21,4 +22,4 @@ env SERVICE_VARIANT="xqueue"
 chdir {{ xqueue_code_dir }}
 setuid {{ xqueue_user }}
 
-exec {{ xqueue_venv_dir }}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi
+exec {{ xqueue_venv_dir }}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi

playbooks/roles/xserver/defaults/main.yml

@@ -38,6 +38,7 @@ xserver_sandbox_venv_dir: "{{ venv_dir }}_apparmor_sandbox"
 xserver_requirements_file: "{{ xserver_code_dir }}/requirements.txt"
 
 xserver_gunicorn_port: 8050
+xserver_gunicorn_host: 8050
 
 xserver_debian_pkgs:
   - build-essential

playbooks/roles/xserver/templates/xserver.conf.j2

@@ -14,6 +14,7 @@ env NEW_RELIC_CONFIG_FILE={{ app_base_dir }}/newrelic.ini
 env NEWRELIC={{ venv_dir }}/bin/newrelic-admin
 env WORKERS={{ ansible_processor|length }}
 env PORT={{ xserver_gunicorn_port }}
+env ADDRESS={{ xserver_gunicorn_host }}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=xserver_aws_settings
 env SERVICE_VARIANT="xserver"
@@ -22,5 +23,5 @@ env SERVICE_VARIANT="xserver"
 chdir {{ xserver_code_dir }}
 setuid www-data
 
-exec {{ venv_dir }}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=30 --pythonpath={{ xserver_code_dir }} pyxserver_wsgi:application
+exec {{ venv_dir }}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=30 --pythonpath={{ xserver_code_dir }} pyxserver_wsgi:application