Pillar fixes (#217)
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:
parent
8ded496de6
commit
62e8ac0b33
@ -118,7 +118,7 @@ nginx:
|
||||
# see also http://nginx.org/en/docs/example.html
|
||||
#-- - - - - -- - - -- - - - - -- - - -- - - - -- - - - - - -- - - - - - -- - - - - -- - - - - -- - - #
|
||||
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
|
||||
# options; if it is found other options (worker_processes: 4 and so
|
||||
# on) are not processed and just upload the file from source
|
||||
@ -126,7 +126,7 @@ nginx:
|
||||
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)
|
||||
events:
|
||||
worker_connections: 768
|
||||
worker_connections: 1024
|
||||
http:
|
||||
sendfile: 'on'
|
||||
include:
|
||||
@ -208,7 +208,7 @@ nginx:
|
||||
- location ~ .htm:
|
||||
- try_files: '$uri $uri/ =404'
|
||||
- test: something else
|
||||
- include 'snippets/letsencrypt.conf'
|
||||
- include: 'snippets/letsencrypt.conf'
|
||||
|
||||
# Or a slightly more compact alternative syntax:
|
||||
|
||||
@ -221,7 +221,7 @@ nginx:
|
||||
- location ~ .htm:
|
||||
- try_files: '$uri $uri/ =404'
|
||||
- test: something else
|
||||
- include 'snippets/letsencrypt.conf'
|
||||
- include: 'snippets/letsencrypt.conf'
|
||||
|
||||
# both of those output:
|
||||
# server {
|
||||
|
Loading…
Reference in New Issue
Block a user