Merge pull request #405 from antoviaque/edxapp-perm-fixes

Fixes for edxapp: Permissions & supervisor startup/configuration

playbooks/roles/edxapp/tasks/deploy.yml

@@ -39,10 +39,6 @@
   sudo_user: "{{ edxapp_user }}"
   tags: deploy
 
-- name: edxapp | compiling all py files in the edx-platform repo
-  shell: "{{ edxapp_venv_bin }}/python -m compileall {{ edxapp_code_dir }}"
-  tags: deploy
-
 - name: edxapp | checkout theme
   git: dest={{ edxapp_app_dir }}/themes/{{edxapp_theme_name}} repo={{edxapp_theme_source_repo}} version={{edxapp_theme_version}}
   when: edxapp_theme_name != ''
@@ -169,11 +165,20 @@
   when: not inst.stat.exists or new.stat.md5 != inst.stat.md5
   tags: deploy
 
+# For pip packages which create group-restricted venv files (httplib2)
+- name: edxapp | ensure all files are readable by any user
+  shell: chmod -R go+r {{ edxapp_venv_dir }}
+  when: not inst.stat.exists or new.stat.md5 != inst.stat.md5
+  tags: deploy
+
 - name: edxapp | create checksum for installed requirements
   shell: cp /var/tmp/edxapp.req.new /var/tmp/edxapp.req.installed
   sudo_user: "{{ edxapp_user }}"
   tags: deploy
 
+- name: edxapp | compiling all py files in the edx-platform repo
+  shell: "{{ edxapp_venv_bin }}/python -m compileall {{ edxapp_code_dir }}"
+  tags: deploy
 
 # https://code.launchpad.net/~wligtenberg/django-openid-auth/mysql_fix/+merge/22726
 # This is necessary for when syncdb is run and the django_openid_auth module is installed,
@@ -190,23 +195,23 @@
 # gather_assets and db migrations
 - include: service_variant_config.yml
 
-- name: edxapp | restart the edxapp services (supervisor)
+- name: edxapp | start the edxapp services (supervisor)
   supervisorctl: >
     name="edxapp:{{ item }}"
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
-    state=restarted
+    state=started
   when: celery_worker is not defined
   with_items: service_variants_enabled
   tags:
     - deploy
 
-- name: edxapp | restart the celery worker services (supervisor)
+- name: edxapp | start the celery worker services (supervisor)
   supervisorctl: >
     name="edxapp_worker:{{ item.service_variant }}_{{ item.queue }}_{{ item.concurrency }}"
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
-    state=restarted
+    state=started
   when: celery_worker is defined
   with_items: edxapp_workers
   tags:

playbooks/roles/edxapp/tasks/main.yml

@@ -20,6 +20,7 @@
     - "{{ edxapp_app_dir }}"
     - "{{ edxapp_venvs_dir }}"
     - "{{ edxapp_theme_dir }}"
+    - "{{ edxapp_staticfile_dir }}"
 
 - name: edxapp | create edxapp log dir
   file: >

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -38,6 +38,15 @@
   tags:
   - deploy
 
+- name: "edxapp | ensuring edxapp is activated in supervisor"
+  supervisorctl: >
+    name="edxapp"
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=present
+  when: celery_worker is not defined
+  tags:
+    - deploy
 
 # write the supervisor script for celery workers
 
@@ -50,6 +59,16 @@
   tags:
   - deploy
 
+- name: edxapp | ensuring edxapp_worker is activated in supervisor
+  supervisorctl: >
+    name="edxapp_worker"
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=present
+  when: celery_worker is defined
+  tags:
+    - deploy
+
 # Gather assets using rake if possible
 
 - name: edxapp | gather {{ item }} static assets with rake