Merge pull request #47 from colinhoglund/master

Convert pidfile into a variable.
pull/51/head 1.7.0
Jeff Geerling 8 years ago
commit baa802befe
  1. 2
      templates/nginx.conf.j2
  2. 1
      vars/Debian.yml
  3. 1
      vars/RedHat.yml

@ -1,7 +1,7 @@
user {{ nginx_user }};
error_log {{ nginx_error_log }};
pid /var/run/nginx.pid;
pid {{ nginx_pidfile }};
worker_processes {{ nginx_worker_processes }};

@ -1,5 +1,6 @@
---
nginx_conf_path: /etc/nginx/conf.d
nginx_pidfile: /run/nginx.pid
nginx_vhost_path: /etc/nginx/sites-enabled
nginx_default_vhost_path: /etc/nginx/sites-enabled/default
__nginx_user: "www-data"

@ -1,5 +1,6 @@
---
nginx_conf_path: /etc/nginx/conf.d
nginx_pidfile: /var/run/nginx.pid
nginx_vhost_path: /etc/nginx/conf.d
nginx_default_vhost_path: /etc/nginx/conf.d/default.conf
__nginx_user: "nginx"