saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #212 from noelmcloughlin/fix8

Browse Source 
Document pid_file pillar for nginx state (#96)
This commit is contained in:
Niels Abspoel 2019-01-26 13:54:17 +01:00 committed by GitHub
commit 6a63ec35ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pillar.example
View File

@ -1,4 +1,7 @@
# nginx: #=====
# nginx: see `nginx.ng` state instead.
#======
nginx:
install_from_source: True install_from_source: True
use_upstart: True use_upstart: True
use_sysvinit: False use_sysvinit: False
@ -14,6 +17,8 @@
headers-more: headers-more:
source: http://github.com/agentzh/headers-more-nginx-module/tarball/v0.21 source: http://github.com/agentzh/headers-more-nginx-module/tarball/v0.21
source_hash: sha1=dbf914cbf3f7b6cb7e033fa7b7c49e2f8879113b source_hash: sha1=dbf914cbf3f7b6cb7e033fa7b7c49e2f8879113b
#pid: /var/run/nginx.pid
# Directory location must exist (i.e. it's /run/nginx.pid on EL7)
# ======== # ========
# nginx.ng # nginx.ng
@ -59,7 +64,7 @@ nginx:
rh_os_releasever: '6' rh_os_releasever: '6'
# Currently it can be used on rhel/centos/suse when installing from repo # Currently it can be used on rhel/centos/suse when installing from repo
gpg_check: True gpg_check: True
pid_file: /var/run/nginx.pid ### Prevent Rendering SLS error (map.jinja:149) if nginx.server.config.pid undefined (Ubuntu, etc) ### pid_file: /var/run/nginx.pid ### prevents rendering SLS error nginx.server.config.pid undefined ###
# Source compilation is not currently a part of nginx.ng # Source compilation is not currently a part of nginx.ng
@ -91,8 +96,8 @@ nginx:
# options; if it is found other options (worker_processes: 4 and so # options; if it is found other options (worker_processes: 4 and so
# on) are not processed and just upload the file from source # on) are not processed and just upload the file from source
worker_processes: 4 worker_processes: 4
load_module: modules/ngx_http_lua_module.so # this will be passed very first in configuration; otherwise nginx will fail to start load_module: modules/ngx_http_lua_module.so # pass as very first in configuration; otherwise nginx will fail to start
pid: /var/run/nginx.pid # Directory location must exist #pid: /var/run/nginx.pid # Directory location must exist (i.e. it's /run/nginx.pid on EL7)
events: events:
worker_connections: 768 worker_connections: 768
http: http: