mainly fix gunicorn templates for var format consistency

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

@@ -4,15 +4,15 @@
 description "gunicorn server"
 author "Calen Pennington <cpennington@mitx.mit.edu>"
  
-start on runlevel [2345]
-stop on runlevel [!2345]
+start on started edxapp
+stop on stopped edxapp
  
 respawn
 respawn limit 3 30
  
 env PID=/var/tmp/cms.pid
-#env NEW_RELIC_CONFIG_FILE=${app_base_dir}/newrelic.ini
-#env NEWRELIC=${venv_dir}/bin/newrelic-admin
+#env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
 env WORKERS={{ ansible_processor_cores * 2 }}
 env PORT=8010
 env LANG=en_US.UTF-8

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

@@ -3,15 +3,15 @@
 description "gunicorn server"
 author "Calen Pennington <cpennington@mitx.mit.edu>"
 
-start on runlevel [2345]
-stop on runlevel [!2345]
+start on started edxapp
+stop on stopped edxapp
 
 respawn
 respawn limit 3 30
 
 env PID=/var/tmp/lms.pid
-#env NEW_RELIC_CONFIG_FILE=${app_base_dir}/newrelic.ini
-#env NEWRELIC=${venv_dir}/bin/newrelic-admin
+#env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
 env WORKERS={{ ansible_processor_cores * 2 }}
 env PORT=8020
 env LANG=en_US.UTF-8
@@ -21,7 +21,7 @@ env SERVICE_VARIANT="lms-preview"
 chdir {{platform_code_dir}}
 setuid www-data
 
-exec ${venv_dir}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi
+exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi
 
 post-start script
   while true

playbooks/roles/gunicorn/templates/lms-xml.conf.j2

@@ -10,19 +10,18 @@ respawn
 respawn limit 3 30
 
 env PID=/var/tmp/lms-xml.pid
-env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
-env NEWRELIC=/opt/edx/bin/newrelic-admin
-env WORKERS=4
+#env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
+env WORKERS={{ ansible_processor_cores * 4 }}
 env PORT=8030
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws
 env SERVICE_VARIANT="lms-xml"
 
-
-chdir /opt/wwc/edx-platform
+chdir {{platform_code_dir}}
 setuid www-data
 
-exec $NEWRELIC run-program /opt/edx/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath=/opt/wwc/edx-platform lms.wsgi
+exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}}  lms.wsgi
 
 post-start script
   while true

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

@@ -3,15 +3,15 @@
 description "gunicorn server"
 author "Calen Pennington <cpennington@mitx.mit.edu>"
 
-start on runlevel [2345]
-stop on runlevel [!2345]
+start on started edxapp
+stop on stopped edxapp
 
 respawn
 respawn limit 3 30
 
 env PID=/var/tmp/lms.pid
-#env NEW_RELIC_CONFIG_FILE=${app_base_dir}/newrelic.ini
-#env NEWRELIC=${venv_dir}/bin/newrelic-admin
+#env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
 env WORKERS={{ ansible_processor_cores * 2 }}
 env PORT=8000
 env LANG=en_US.UTF-8
@@ -21,7 +21,7 @@ env SERVICE_VARIANT="lms"
 chdir {{platform_code_dir}}
 setuid www-data
 
-exec ${venv_dir}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi
+exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi
 
 post-start script
   while true

playbooks/roles/npm/tasks/main.yml

@@ -2,8 +2,8 @@
 #   - common/tasks/main.yml
 #   - ruby/tasks/main.yml
 ---
-- name: Install nodejs, and by extension npm
-  apt: pkg=nodejs state=present install_recommends=no
+- name: Install npm
+  apt: pkg=npm state=present install_recommends=no
   tags:
   - npm
   - install