Fix conflicting parameter
diff --git a/nginx/files/nginx.conf b/nginx/files/nginx.conf
index 1f657a5..3686872 100644
--- a/nginx/files/nginx.conf
+++ b/nginx/files/nginx.conf
@@ -1,5 +1,5 @@
{%- from "nginx/map.jinja" import server with context -%}
-user {{ server.user }};
+user {{ server.system_user }};
worker_processes {{ server.get('worker', {}).get('processes', 'auto') }};
pid /run/nginx.pid;
diff --git a/nginx/files/sensu.conf b/nginx/files/sensu.conf
index 9a37de8..4a128ee 100644
--- a/nginx/files/sensu.conf
+++ b/nginx/files/sensu.conf
@@ -6,7 +6,7 @@
subscribers:
- local-nginx-server
local_nginx_server_worker_procs:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u {{ server.user }} -c 1:20"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u {{ server.system_user }} -c 1:20"
interval: 60
occurrences: 1
subscribers:
diff --git a/nginx/map.jinja b/nginx/map.jinja
index 6f970e7..360cab5 100644
--- a/nginx/map.jinja
+++ b/nginx/map.jinja
@@ -3,14 +3,14 @@
'Debian': {
'pkgs': ['nginx', 'apache2-utils'],
'service': 'nginx',
- 'user': 'www-data',
+ 'system_user': 'www-data',
'vhost_dir': '/etc/nginx/sites-available',
'log_dir': '/var/log/nginx',
},
'RedHat': {
'pkgs': ['nginx', 'httpd-tools'],
'service': 'nginx',
- 'user': 'nginx',
+ 'system_user': 'nginx',
'vhost_dir': '/etc/nginx/conf.d',
'log_dir': '/var/log/nginx',
},
diff --git a/nginx/meta/sensu.yml b/nginx/meta/sensu.yml
index 9765584..6f425ea 100644
--- a/nginx/meta/sensu.yml
+++ b/nginx/meta/sensu.yml
@@ -7,7 +7,7 @@
subscribers:
- local-nginx-server
local_nginx_server_worker_procs:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u {{ server.user }} -c 1:20"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nginx -u {{ server.system_user }} -c 1:20"
interval: 60
occurrences: 1
subscribers: