Revert "Change user, as which nginx is running (#209)" (#210)

This reverts commit b90cc28.
jdauphant · Mar 17, 2018 · 73afb81 · 73afb81
1 parent b90cc28
commit 73afb81
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -15,7 +15,7 @@ nginx_service_name: "{{nginx_binary_name}}"
 nginx_conf_dir: /etc/nginx # For this variable, a specific value for the OS can be apply in vars/{{ ansible_os_family }}.yml
 nginx_default_site_template: "site.conf.j2"
 
-nginx_user: "{{nginx_default_user}}"
+nginx_user: nginx  # For this variable, a specific value for the OS can be apply in vars/{{ ansible_os_family }}.
 nginx_group: "{{nginx_user}}"
 
 nginx_pid_file: '/var/run/{{nginx_service_name}}.pid'

diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,2 +1,2 @@
 ---
-nginx_default_user: www-data
+nginx_user: www-data
diff --git a/vars/FreeBSD.yml b/vars/FreeBSD.yml
@@ -1,5 +1,5 @@
 ---
 nginx_conf_dir: /usr/local/etc/nginx
-nginx_default_user: www
+nginx_user: www
 nginx_sites_default_root: /usr/local/www/nginx-dist
 nginx_conf_group: wheel
diff --git a/vars/Solaris.yml b/vars/Solaris.yml
@@ -1,4 +1,4 @@
 ---
 nginx_conf_dir: /opt/local/etc/nginx
-nginx_default_user: www
+nginx_user: www
 nginx_sites_default_root: /opt/local/www
diff --git a/vars/empty.yml b/vars/empty.yml
@@ -1,3 +1,2 @@
 ---
 # This file intentionally does not define any variables.
-nginx_defaut_user: nginx