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

Pillar fixes (#217)

Browse Source 
Squashed from:

* pillar.example: an include was missing a colon
* pillar.example: 2 directives not indented properly
* pillar.example: added the stock log_format
* pillar.example: make log path match map.jinja
* pillar.example: worker_connections value from latest mainline nginx
* pillar.example: fixed other uses of include
* pillar.example: corrected formatting
* pillar.example: corrected log_format
* pillar.example: reset log_format to try another day
This commit is contained in:
Garrett W 2019-04-11 11:45:48 -05:00 committed by Imran Iqbal
parent 8ded496de6
commit 62e8ac0b33
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pillar.example
View File

@ -118,7 +118,7 @@ nginx:
# see also http://nginx.org/en/docs/example.html # see also http://nginx.org/en/docs/example.html
#-- - - - - -- - - -- - - - - -- - - -- - - - -- - - - - - -- - - - - - -- - - - - -- - - - - -- - - # #-- - - - - -- - - -- - - - - -- - - -- - - - -- - - - - - -- - - - - - -- - - - - -- - - - - -- - - #
config: config:
include 'snippets/letsencrypt.conf' include: 'snippets/letsencrypt.conf'
source_path: salt://path_to_nginx_conf_file/nginx.conf # IMPORTANT: This option is mutually exclusive with the rest of the source_path: salt://path_to_nginx_conf_file/nginx.conf # IMPORTANT: This option is mutually exclusive with the rest of the
# 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
@ -126,18 +126,18 @@ nginx:
load_module: modules/ngx_http_lua_module.so # pass as 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 (i.e. it's /run/nginx.pid on EL7) #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: 1024
http: http:
sendfile: 'on' sendfile: 'on'
include: include:
#### Note: Syntax issues in these files generate nginx [emerg] errors on startup. #### #### Note: Syntax issues in these files generate nginx [emerg] errors on startup. ####
- /etc/nginx/mime.types - /etc/nginx/mime.types
### module ngx_http_log_module example ### module ngx_http_log_module example
log_format: |- log_format: |-
main '...'; main '...';
access_log /var/log/nginx/access_log main access_log /var/log/nginx/access_log main
access_log: [] #suppress default access_log option from being added access_log: [] #suppress default access_log option from being added
### module nngx_stream_core_module ### module nngx_stream_core_module
### https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/#example ### https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/#example
@ -208,7 +208,7 @@ nginx:
- location ~ .htm: - location ~ .htm:
- try_files: '$uri $uri/ =404' - try_files: '$uri $uri/ =404'
- test: something else - test: something else
- include 'snippets/letsencrypt.conf' - include: 'snippets/letsencrypt.conf'
# Or a slightly more compact alternative syntax: # Or a slightly more compact alternative syntax:
@ -221,7 +221,7 @@ nginx:
- location ~ .htm: - location ~ .htm:
- try_files: '$uri $uri/ =404' - try_files: '$uri $uri/ =404'
- test: something else - test: something else
- include 'snippets/letsencrypt.conf' - include: 'snippets/letsencrypt.conf'
# both of those output: # both of those output:
# server { # server {