Moved var nginx_system_user to global vars

group_vars/all/vars.yml

@@ -113,6 +113,7 @@ global_log_directory: "/var/log"
 global_nfs_port: "2049" # for version 4
 global_nfs_directory: "{{ global_webservers_directory }}/nfs"
 
+global_nginx_system_user: www-data
 global_nginx_service_name: "nginx.service"
 
 global_pamd: "/etc/pam.d"

roles/nginx/application/defaults/main.yml

@@ -1,7 +1,5 @@
 ---
 
-nginx_system_user: www-data
-
 nginx_installation_directory: "/etc/nginx"
 nginx_upstreams_directory: "{{ nginx_installation_directory }}/upstreams"
 nginx_sites_directory: "{{ nginx_installation_directory }}/sites"

roles/nginx/application/templates/nginx.conf

@@ -1,4 +1,4 @@
-user {{ nginx_system_user }} {{ nginx_system_user }};
+user {{ global_nginx_system_user }} {{ global_nginx_system_user }};
 worker_processes auto;
 pid /run/nginx.pid;
 include {{ nginx_installation_directory }}/modules-enabled/*.conf;

roles/nginx/mail_proxy/tasks/main.yml

@@ -4,8 +4,8 @@
   template:
     src: mail_proxy.conf
     dest: "{{ nginx_streams_directory }}/{{ domain }}:{{ port }}"
-    owner: "{{ nginx_system_user }}"
+    owner: "{{ global_nginx_system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rw,g=r,o=r"
 
 - name: Allow {{ protocol }} in firewall

roles/nginx/php-pool/tasks/main.yml

@@ -5,7 +5,7 @@
     path: "{{ socket_directory }}"
     state: directory
     owner: "{{ system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="
 
 - name: Check if src is a directory
@@ -13,7 +13,7 @@
     path: "{{ src }}"
     state: directory
     owner: "{{ system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="
 
 - name: Configure pool in php-fpm

roles/nginx/php-pool/templates/pool.conf

@@ -1,11 +1,11 @@
 [{{ pool_name }}]
 
 user = {{ system_user }}
-group = {{ nginx_system_user }}
+group = {{ global_nginx_system_user }}
 
 listen = {{ socket }}
 listen.owner = {{ system_user }}
-listen.group = {{ nginx_system_user }}
+listen.group = {{ global_nginx_system_user }}
 listen.mode = 0660
 
 pm = dynamic

roles/server/firefox-sync/tasks/main.yml

@@ -40,7 +40,7 @@
     state: directory
     path: "{{ socket_directory }}"
     owner: "{{ system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="
 
 - name: Register socket for firefox sync server

roles/server/firefox-sync/templates/firefox.socket

@@ -4,7 +4,7 @@ Description=firefox sync server socket at {{ domain }}
 [Socket]
 ListenStream={{ socket_path }}
 SocketUser={{ system_user }}
-SocketGroup={{ nginx_system_user }}
+SocketGroup={{ global_nginx_system_user }}
 SocketMode=0660
 
 [Install]

roles/server/gitea/tasks/main.yml

@@ -21,7 +21,7 @@
     path: "{{ user_directory }}"
     state: directory
     owner: "{{ gitea_system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="
 
 - name: Configure installation directory

roles/server/nextcloud/meta/main.yml

@@ -6,7 +6,7 @@ dependencies:
   - role: misc/system_user
     # system_user
     # user_directory
-    user_directory_group: "{{ nginx_system_user }}"
+    user_directory_group: "{{ global_nginx_system_user }}"
   - role: misc/backup_files
     # domain
     backup_directory: "{{ nextcloud_data_directory }}"

roles/server/php/meta/main.yml

@@ -6,14 +6,14 @@ dependencies:
   - role: misc/system_user
     # system_user
     # user_directory
-    user_directory_group: "{{ nginx_system_user }}"
+    user_directory_group: "{{ global_nginx_system_user }}"
   - role: mysql/database
     # database_user
   - role: git_auto_update
     # repo
     dest: "{{ installation_directory }}"
     owner: "{{ system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="
     repo_name: "{{ domain }}"
     reload_command: "systemctl restart {{ phpfpm_package }}"

roles/server/static/meta/main.yml

@@ -6,5 +6,5 @@ dependencies:
     name: "{{ domain }}"
     dest: "{{ root_directory }}"
     owner: root
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="

roles/server/tt-rss/meta/main.yml

@@ -7,13 +7,13 @@ dependencies:
   - role: misc/system_user
     # system_user
     # user_directory
-    user_directory_group: "{{ nginx_system_user }}"
+    user_directory_group: "{{ global_nginx_system_user }}"
   - role: git_auto_update
     # repo
     repo_name: "{{ domain }}"
     dest: "{{ installation_directory }}"
     owner: "{{ system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rwx,g=rx,o="
     reload_command: "true"
   - role: mysql/database

roles/server/tt-rss/tasks/main.yml

@@ -5,7 +5,7 @@
     src: config.php
     dest: "{{ installation_directory }}/config.php"
     owner: "{{ system_user }}"
-    group: "{{ nginx_system_user }}"
+    group: "{{ global_nginx_system_user }}"
     mode: "u=rw,g=r,o="
   notify: "restart {{ domain }}"