Selaa lähdekoodia

Merge pull request #47 from colinhoglund/master

Convert pidfile into a variable.
Jeff Geerling 9 vuotta sitten
vanhempi
commit
baa802befe
3 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 1 1
      templates/nginx.conf.j2
  2. 1 0
      vars/Debian.yml
  3. 1 0
      vars/RedHat.yml

+ 1 - 1
templates/nginx.conf.j2

@@ -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 - 0
vars/Debian.yml

@@ -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 - 0
vars/RedHat.yml

@@ -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"