From 084a6f283bd7f0f2e6cbf38933eeb941883721de Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Wed, 29 Jul 2015 23:57:54 +0200 Subject: [PATCH] Fixed PID --- README.md | 1 - defaults/main.yml | 1 - templates/etc/nginx/nginx.conf.j2 | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 303b288..f35fd75 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ Socket: - `nginx_user` - `nginx_worker_processes` - - `nginx_pid` - `nginx_events`: key/value in events block - `nginx_http`: key/value in http block diff --git a/defaults/main.yml b/defaults/main.yml index 1a0c893..78ce798 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,7 +36,6 @@ nginx_php_sockets: # nginx_user: 'www-data' nginx_worker_processes: '{{ ansible_processor_vcpus }}' -nginx_pid: '/run/nginx.pid' nginx_events: worker_connections: '512' diff --git a/templates/etc/nginx/nginx.conf.j2 b/templates/etc/nginx/nginx.conf.j2 index 50bc444..65f6b7d 100644 --- a/templates/etc/nginx/nginx.conf.j2 +++ b/templates/etc/nginx/nginx.conf.j2 @@ -4,7 +4,7 @@ user {{ nginx_user }}; worker_processes {{ nginx_worker_processes }}; -pid {{ nginx_pid }}; +pid /run/nginx.pid; events { {% for key, value in nginx_events.iteritems() %} @@ -16,7 +16,7 @@ http { types_hash_max_size 2048; include /etc/nginx/mime.types; default_type application/octet-stream; - + # From Ansible {% for key, value in nginx_http.iteritems() %} {{ "\t%-30s %s" | format(key, value) }};