Merge pull request #4616 from edx/jibsheet/gunicorn-timeout

Allow easy override of the gunicorn timeout

CHANGELOG.md

 - nginx:
   - remove nginx_cfg - an internal variable that was really only used for the edx-release nginx site, which served version.{html,json} off of a nonstandard port.  The file it served was never populated.
 
+- Role: edxapp
+  - Create EDXAPP_CMS_GUNICORN_TIMEOUT and EDXAPP_LMS_STATIC_URL_BASE to allow overriding of the gunicorn timeout
+
 - Structure: edx-east
   - Deprecated the edx-east folder, playbooks now live in the top level directory instead of edx-east/playbooks. A symbolic link was added for now, but should not be relied upon.
 

playbooks/roles/edxapp/defaults/main.yml

@@ -29,9 +29,11 @@ EDXAPP_CMS_BASE: "{{ EDXAPP_CMS_SITE_NAME }}:{{ EDXAPP_CMS_NGINX_PORT }}"
 
 EDXAPP_LMS_GUNICORN_EXTRA: ""
 EDXAPP_LMS_GUNICORN_EXTRA_CONF: ""
+EDXAPP_LMS_GUNICORN_TIMEOUT: 300
 
 EDXAPP_CMS_GUNICORN_EXTRA: ""
 EDXAPP_CMS_GUNICORN_EXTRA_CONF: ""
+EDXAPP_CMS_GUNICORN_TIMEOUT: 300
 
 # Set this to the maximum number
 # of requests for gunicorn for the lms and cms

playbooks/roles/edxapp/templates/cms_gunicorn.py.j2

@@ -6,7 +6,7 @@ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
 import multiprocessing
 
 preload_app = False
-timeout = 300
+timeout = {{ EDXAPP_CMS_GUNICORN_TIMEOUT }}
 bind = "{{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }}"
 pythonpath = "{{ edxapp_code_dir }}"
 

playbooks/roles/edxapp/templates/lms_gunicorn.py.j2

@@ -6,7 +6,7 @@ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
 import multiprocessing
 
 preload_app = False
-timeout = 300
+timeout = {{ EDXAPP_LMS_GUNICORN_TIMEOUT }}
 bind = "{{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }}"
 pythonpath = "{{ edxapp_code_dir }}"