Make apache-user and apache-group role defaults

group_vars/cdhweb/vars.yml

@@ -13,10 +13,6 @@ app_name: cdhweb
 symlink: cdhweb
 # apache location
 apache_app_path: "/var/www/{{ app_name }}"
-# apache group uses ubuntu default of "www-data"
-apache_group: "www-data"
-# media_root settings
-media_root: /srv/www/media
 # wsgi path
 wsgi_path: "{{ django_app }}/wsgi.py"
 # nodejs version

roles/configure_logging/defaults/main.yml

@@ -0,0 +1,3 @@
+---
+apache_user: "www-data"
+apache_group: "{{ apache_user }}"

roles/configure_logging/tasks/main.yml

@@ -19,7 +19,7 @@
     - name: For PUL VMs, set logging directory owner and group to apache
       file:
         path: '{{ logging_dir }}'
-        owner: '{{ apache_group }}'
+        owner: '{{ apache_user }}'
         group: '{{ apache_group }}'
         recurse: true
       when: deploy_user is defined and ansible_distribution != 'Springdale'

roles/configure_media/defaults/main.yml

@@ -1,3 +1,5 @@
 ---
 # default for configure_media
-apache_group: apache
+media_root: "/var/www/media/"
+apache_user: "www-data"
+apache_group: "{{ apache_user }}"

roles/django_compressor/defaults/main.yml

@@ -1,3 +1,4 @@
 ---
 # default for configure_media
-apache_group: apache
+apache_user: "www-data"
+apache_group: "{{ apache_user }}"