Merge pull request #3320 from edx/saleem-latif/SOL-2032

SOL-2032: Theming broken for "From Scratch" AMI builds

playbooks/roles/ecommerce/meta/main.yml

@@ -25,8 +25,6 @@ dependencies:
   - role: edx_themes
     theme_users:
       - "{{ ecommerce_user }}"
-    additional_theme_dirs:
-      - "{{ ECOMMERCE_COMPREHENSIVE_THEME_DIRS }}"
     when: "{{ ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING }}"
 
   - oraclejdk

playbooks/roles/edx_themes/defaults/main.yml

@@ -13,7 +13,7 @@
 
 themes_service_name: "edx-themes"
 themes_user: "{{ themes_service_name }}"
-themes_group: "{{ themes_user }}"
+themes_group: "www-data"
 themes_home: "{{ COMMON_DATA_DIR }}/{{ themes_service_name }}"
 
 THEMES_CODE_DIR: "{{ themes_home }}/{{ themes_service_name }}"

playbooks/roles/edx_themes/tasks/main.yml

@@ -28,8 +28,6 @@
 #     theme_users:
 #       - ecommerce
 #       - edxapp
-#     additional_theme_dirs:
-#      - /edx/app/ecommerce/ecommerce/ecommerce/themes
 #     when do_setup_themes
 #
 
@@ -46,19 +44,6 @@
     - install
     - install:base
 
-- name: assign theme's group to all theme's directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    recurse: yes
-    group: "{{ themes_group }}"
-    mode: "g+rw"
-  with_items: additional_theme_dirs
-  when: additional_theme_dirs is defined
-  tags:
-    - install
-    - install:base
-
 - name: Add theme users to theme's group so that that have read/write access to themes directories
   user:
     name: "{{ item }}"

playbooks/roles/edxapp/meta/main.yml

@@ -7,6 +7,4 @@ dependencies:
   - role: edx_themes
     theme_users:
       - "{{ edxapp_user }}"
-    additional_theme_dirs:
-      - "{{ EDXAPP_COMPREHENSIVE_THEME_DIRS }}"
     when: "{{ EDXAPP_ENABLE_COMPREHENSIVE_THEMING }}"