diff --git a/roles/apache2/defaults/main.yml b/roles/apache2/defaults/main.yml index 888eda1..479c03b 100644 --- a/roles/apache2/defaults/main.yml +++ b/roles/apache2/defaults/main.yml @@ -3,6 +3,8 @@ apache2_vhost_serveradmin: webmaster@localhost apache2_vhost_serveraliases: [] apache2_vhost_documentroot: /var/www/html +apache2_vhost_documentroot_owner: www-data +apache2_vhost_documentroot_group: www-data apache2_vhost_loglevel: warn apache2_vhost_errorlog: "${APACHE_LOG_DIR}/error.log" apache2_vhost_accesslog: "${APACHE_LOG_DIR}/access.log combined" diff --git a/roles/apache2/tasks/config.yml b/roles/apache2/tasks/config.yml index d73869d..b2df1ef 100644 --- a/roles/apache2/tasks/config.yml +++ b/roles/apache2/tasks/config.yml @@ -27,8 +27,8 @@ ansible.builtin.file: path: "{{ item.documentroot | default(apache2_vhost_documentroot) }}" state: directory - owner: www-data - group: www-data + owner: {{ item.documentroot_owner | default(apache2_vhost_documentroot_owner) }} + group: {{ item.documentroot_group | default(apache2_vhost_documentroot_group) }} mode: 0755 loop: "{{ apache2_sites.values() }}" diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index f10430f..61611f7 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -2,6 +2,8 @@ nginx_vhost_serveraliases: [] nginx_vhost_documentroot: /var/www/html +nginx_vhost_documentroot_owner: www-data +nginx_vhost_documentroot_group: www-data nginx_vhost_http_enabled: true nginx_vhost_https_enabled: true diff --git a/roles/nginx/tasks/config.yml b/roles/nginx/tasks/config.yml index 06866fe..5a4c92e 100644 --- a/roles/nginx/tasks/config.yml +++ b/roles/nginx/tasks/config.yml @@ -31,8 +31,8 @@ ansible.builtin.file: path: "{{ item.documentroot | default(nginx_vhost_documentroot) }}" state: directory - owner: www-data - group: www-data + owner: {{ item.documentroot_owner | default(nginx_vhost_documentroot_owner) }} + group: {{ item.documentroot_group | default(nginx_vhost_documentroot_group) }} mode: 0755 loop: "{{ nginx_sites.values() }}" diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 45de3b0..c10a5ae 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -12,7 +12,7 @@ dest: /etc/nginx/dh_param owner: root group: root - moe: 0644 + mode: 0644 notify: reload nginx - name: start and enable nginx