Merge pull request #1436 from edx/feanil/compile_course_js

Let the common web user write to course data.

playbooks/roles/edxapp/defaults/main.yml

@@ -299,8 +299,9 @@ edxapp_rbenv_shims: "{{ edxapp_rbenv_root }}/shims"
 edxapp_rbenv_bin: "{{ edxapp_rbenv_root }}/bin"
 edxapp_gem_root: "{{ edxapp_rbenv_dir }}/.gem"
 edxapp_gem_bin: "{{ edxapp_gem_root }}/bin"
+edxapp_node_bin: "{{ edxapp_code_dir }}/node_modules/.bin"
 edxapp_user: edxapp
-edxapp_deploy_path: "{{ edxapp_venv_bin }}:{{ edxapp_code_dir }}/bin:{{ edxapp_rbenv_bin }}:{{ edxapp_rbenv_shims }}:{{ edxapp_gem_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+edxapp_deploy_path: "{{ edxapp_venv_bin }}:{{ edxapp_code_dir }}/bin:{{ edxapp_rbenv_bin }}:{{ edxapp_rbenv_shims }}:{{ edxapp_gem_bin }}:{{ edxapp_node_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 edxapp_staticfile_dir: "{{ edxapp_data_dir }}/staticfiles"
 edxapp_course_static_dir: "{{ edxapp_data_dir }}/course_static"
 edxapp_course_data_dir: "{{ edxapp_data_dir }}/data"
@@ -308,6 +309,10 @@ edxapp_upload_dir: "{{ edxapp_data_dir }}/uploads"
 edxapp_theme_dir: "{{ edxapp_data_dir }}/themes"
 edxapp_git_identity: "{{ edxapp_app_dir }}/edxapp-git-identity"
 edxapp_git_ssh: "/tmp/edxapp_git_ssh.sh"
+
+# TODO: This can be removed once VPC-122 is resolved
+edxapp_legacy_course_data_dir: "{{ edxapp_app_dir }}/data"
+
 edxapp_workers:
   - queue: low
     service_variant: cms

playbooks/roles/edxapp/tasks/deploy.yml

@@ -388,6 +388,18 @@
     chdir="{{ edxapp_data_dir }}"
   when: download_xml_s3.changed
 
+# This currently has to be done because
+# the course coffescript is compiled on the fly
+# by the application after startup.
+# See VPC-117 and VPC-122
+- name: make the course data web user writable
+  file:
+    path="{{ edxapp_course_data_dir }}"
+    state=directory
+    recurse=yes
+    owner="{{ common_web_user }}"
+    group="{{ edxapp_user }}"
+
 # creates the supervisor jobs for the
 # service variants configured, runs
 # gather_assets and db migrations

playbooks/roles/edxapp/tasks/main.yml

@@ -27,6 +27,19 @@
     - "{{ edxapp_staticfile_dir }}"
     - "{{ edxapp_course_static_dir }}"
 
+# This is a symlink that has to exist because
+# we currently can't override the DATA_DIR var
+# in edx-platform. TODO: This can be removed once
+# VPC-122 is closed
+- name: make the course data dir
+  file:
+    src="{{ edxapp_course_data_dir }}"
+    dest="{{ edxapp_legacy_course_data_dir }}"
+    state=link
+    owner="{{ edxapp_user }}"
+    group="{{ common_web_group }}"
+    
+
 - name: create edxapp log dir
   file: >
     path="{{ edxapp_log_dir }}" state=directory

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

@@ -25,7 +25,7 @@ command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host
 
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}
-environment={% if COMMON_ENABLE_NEWRELIC %}NEW_RELIC_APP_NAME={{ EDXAPP_NEWRELIC_LMS_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}  PORT={{edxapp_lms_gunicorn_port}},ADDRESS={{edxapp_lms_gunicorn_host}},LANG={{ EDXAPP_LANG }},DJANGO_SETTINGS_MODULE={{ edxapp_lms_env }},SERVICE_VARIANT="lms"
+environment={% if COMMON_ENABLE_NEWRELIC %}NEW_RELIC_APP_NAME={{ EDXAPP_NEWRELIC_LMS_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% 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 }}"
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
 stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
 killasgroup=true