Fix directory user/group on FreeBSD (#195)

* Fix directory user/group on FreeBSD * Remove unecessary file permissions
jdauphant · Nov 20, 2017 · 2d04bb8 · 2d04bb8
1 parent 4b72d6e
commit 2d04bb8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -27,6 +27,9 @@ nginx_log_user: "{% if ansible_os_family == 'Debian' %}root{% else %}{{nginx_use
 nginx_log_group: "{% if ansible_os_family == 'Debian' %}adm{% else %}{{nginx_group}}{% endif %}"
 nginx_error_log_level: "error"
 
+nginx_conf_user: root
+nginx_conf_group: root
+
 nginx_extra_root_params: []
 nginx_events_params:
   - worker_connections {% if nginx_max_clients is defined %}{{nginx_max_clients}}{% else %}512{% endif %}

diff --git a/tasks/configuration.yml b/tasks/configuration.yml
@@ -10,8 +10,6 @@
   template:
     src: auth_basic.j2
     dest: "{{ nginx_conf_dir }}/auth_basic/{{ item.key }}"
-    owner: root
-    group: "{{ nginx_group }}"
     mode: 0750
   with_dict: "{{ nginx_auth_basic_files }}"
 

diff --git a/tasks/ensure-dirs.yml b/tasks/ensure-dirs.yml
@@ -3,8 +3,8 @@
   file:
     path: "{{nginx_conf_dir}}/{{ item }}"
     state: directory
-    owner: root
-    group: root
+    owner: "{{ nginx_conf_user }}"
+    group: "{{ nginx_conf_group }}"
     mode: 0755
   with_items:
     - "sites-available"

diff --git a/vars/FreeBSD.yml b/vars/FreeBSD.yml
@@ -2,3 +2,4 @@
 nginx_conf_dir: /usr/local/etc/nginx
 nginx_user: www
 nginx_sites_default_root: /usr/local/www/nginx-dist
+nginx_conf_group: wheel