Use var for www-data user

Author: bradymholt

playbook.yml

@@ -3,17 +3,17 @@
   hosts: all
   remote_user: root
   roles:
-    - webserver
     - rvm_io.ruby
     - s3cmd
     - nodejs
+    - mysql
     - nginx-passenger
     - role: ssl
       when: use_ssl
       domainsets:
         - domains:
           - "{{ webserver_name }}"
-    - mysql
+    - webserver
 
 - name: deploy
   hosts: all

roles/nginx-passenger/defaults/main.yml

@@ -1,2 +1,3 @@
 ---
-# defaults file for ansible-nginx-passenger
+nginx_conf_dir: /etc/nginx
+nginx_conf_file: "{{ nginx_conf_dir }}/sites-available/{{ app_name }}.conf"

roles/nginx-passenger/tasks/main.yml

@@ -61,12 +61,12 @@
     secret_key_base: "{{ uuidgen_output.stdout }}"
 
 - name: nginx - setup config for app
-  template: src=etc_nginx_sites-available.conf.j2 dest=/etc/nginx/sites-available/{{ app_name }} group=www-data owner=www-data force=yes
+  template: src=etc_nginx_sites-available.conf.j2 dest=dest={{ nginx_conf_file }} group={{ webserver_user }} owner={{ webserver_user }} force=yes
 
 - name: nginx - enable the app
   file:
     state: link
-    src: /etc/nginx/sites-available/{{ app_name }}
+    src: {{ nginx_conf_file }}
     dest: /etc/nginx/sites-enabled/{{ app_name }}
 
 - name: nginx - restart

roles/nginx-passenger/vars/main.yml

@@ -1,2 +1,2 @@
 ---
-# vars file for ansible-nginx-passenger
+webserver_user: www-data

roles/webserver/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+- role: nginx-passenger

roles/webserver/tasks/main.yml

@@ -12,7 +12,7 @@
     state=present"
 
 - name: create deploy directory
-  file: path={{ deploy_directory }} state=directory owner={{ deploy_user }} group=www-data mode=0775
+  file: path={{ deploy_directory }} state=directory owner={{ deploy_user }} group={{ webserver_user }} mode=0775
 
 - name: update apt cache
   apt: update_cache=yes