move lms and cms to bash based wrapper scripts

playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2

+#!/usr/bin/env bash
+
+# {{ ansible_managed }}
+
+{% set edxapp_venv_bin = edxapp_venv_dir + "/bin" %}
+
+{% if COMMON_ENABLE_NEWRELIC_APP %}
+{% set executable = edxapp_venv_bin + '/newrelic-admin run-program ' + edxapp_venv_bin + '/gunicorn' %}
+{% else %}
+{% set executable = edxapp_venv_bin + '/gunicorn' %}
+{% endif %}
+
+{% if COMMON_ENABLE_NEWRELIC_APP %}
+export NEW_RELIC_APP_NAME="{{ EDXAPP_NEWRELIC_CMS_APPNAME }}"
+export NEW_RELIC_CONFIG_FILE="{{ edxapp_app_dir }}/newrelic.ini",
+if command -v ec2metadata >/dev/null 2>&1; then
+  INSTANCEID=$(ec2metadata --instance-id);
+  HOSTNAME=$(hostname)
+  export NEW_RELIC_PROCESS_HOST_DISPLAY_NAME="$HOSTNAME-$INSTANCEID"
+fi
+export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}"
+{% endif -%}
+
+export PORT="{{ edxapp_cms_gunicorn_port }}"
+export ADDRESS="{{ edxapp_cms_gunicorn_host }}"
+export LANG="{{ EDXAPP_LANG }}"
+export DJANGO_SETTINGS_MODULE="{{ EDXAPP_CMS_ENV }}"
+export SERVICE_VARIANT="cms"
+export PATH="{{ edxapp_deploy_path }}"
+export BOTO_CONFIG="{{ edxapp_app_dir }}/.boto"
+
+source {{ edxapp_app_dir }}/edxapp_env
+{{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi

playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2

+#!/usr/bin/env bash
+
+# {{ ansible_managed }}
+
+{% set edxapp_venv_bin = edxapp_venv_dir + "/bin" %}
+
+{% if COMMON_ENABLE_NEWRELIC_APP %}
+{% set executable = edxapp_venv_bin + '/newrelic-admin run-program ' + edxapp_venv_bin + '/gunicorn' %}
+{% else %}
+{% set executable = edxapp_venv_bin + '/gunicorn' %}
+{% endif %}
+
+{% if COMMON_ENABLE_NEWRELIC_APP %}
+export NEW_RELIC_APP_NAME="{{ EDXAPP_NEWRELIC_LMS_APPNAME }}"
+export NEW_RELIC_CONFIG_FILE="{{ edxapp_app_dir }}/newrelic.ini",
+if command -v ec2metadata >/dev/null 2>&1; then
+  INSTANCEID=$(ec2metadata --instance-id);
+  HOSTNAME=$(hostname)
+  export NEW_RELIC_PROCESS_HOST_DISPLAY_NAME="$HOSTNAME-$INSTANCEID"
+fi
+export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}"
+{% endif -%}
+
+export PORT="{{ edxapp_lms_gunicorn_port }}"
+export ADDRESS="{{ edxapp_lms_gunicorn_host }}"
+export LANG="{{ EDXAPP_LANG }}"
+export DJANGO_SETTINGS_MODULE="{{ EDXAPP_LMS_ENV }}"
+export SERVICE_VARIANT="lms"
+export PATH="{{ edxapp_deploy_path }}"
+export BOTO_CONFIG="{{ edxapp_app_dir }}/.boto"
+
+source {{ edxapp_app_dir }}/edxapp_env
+{{ executable }} -c {{ edxapp_app_dir }}/lms_gunicorn.py lms.wsgi

playbooks/roles/edxapp/templates/cms.conf.j2 → playbooks/roles/edxapp/templates/edx/app/supervisor/conf.d.available/cms.conf.j2

 [program:cms]
 
-{% if COMMON_ENABLE_NEWRELIC_APP -%}
-{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' -%}
-{% else -%}
-{% set executable = edxapp_venv_dir + '/bin/gunicorn' -%}
-{% endif -%}
 
-command={{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
+command={{ edxapp_app_dir }}/cms.sh
 
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}
-environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ EDXAPP_NEWRELIC_CMS_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}PORT={{ edxapp_cms_gunicorn_port }},ADDRESS={{ edxapp_cms_gunicorn_host }},LANG={{ EDXAPP_LANG }},DJANGO_SETTINGS_MODULE={{ EDXAPP_CMS_ENV }},SERVICE_VARIANT="cms",BOTO_CONFIG="{{ edxapp_app_dir }}/.boto"
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
 stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true

playbooks/roles/edxapp/templates/lms.conf.j2 → playbooks/roles/edxapp/templates/edx/app/supervisor/conf.d.available/lms.conf.j2

 [program:lms]
 
-{% if COMMON_ENABLE_NEWRELIC_APP -%}
-{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' -%}
-{% else -%}
-{% set executable = edxapp_venv_dir + '/bin/gunicorn' -%}
-{% endif -%}
-
-command={{ executable }} -c {{ edxapp_app_dir }}/lms_gunicorn.py lms.wsgi
+command={{ edxapp_app_dir }}/lms.sh
 
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}
-environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ EDXAPP_NEWRELIC_LMS_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},NEW_RELIC_CONFIG_FILE={{ edxapp_app_dir }}/newrelic.ini,{% endif -%}  PORT={{ edxapp_lms_gunicorn_port }},ADDRESS={{ edxapp_lms_gunicorn_host }},LANG={{ EDXAPP_LANG }},DJANGO_SETTINGS_MODULE={{ EDXAPP_LMS_ENV }},SERVICE_VARIANT="lms",PATH="{{ edxapp_deploy_path }}",BOTO_CONFIG="{{ edxapp_app_dir }}/.boto"
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
 stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 killasgroup=true