Skip to content

Commit 03e0947

Browse files
garrettwblarghmatey
authored andcommitted
Pillar fixes (saltstack-formulas#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
1 parent 69eae23 commit 03e0947

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pillar.example

+9-9
Original file line numberDiff line numberDiff line change
@@ -118,26 +118,26 @@ nginx:
118118
# see also http://nginx.org/en/docs/example.html
119119
#-- - - - - -- - - -- - - - - -- - - -- - - - -- - - - - - -- - - - - - -- - - - - -- - - - - -- - - #
120120
config:
121-
include 'snippets/letsencrypt.conf'
121+
include: 'snippets/letsencrypt.conf'
122122
source_path: salt://path_to_nginx_conf_file/nginx.conf # IMPORTANT: This option is mutually exclusive with the rest of the
123123
# options; if it is found other options (worker_processes: 4 and so
124124
# on) are not processed and just upload the file from source
125125
worker_processes: 4
126126
load_module: modules/ngx_http_lua_module.so # pass as very first in configuration; otherwise nginx will fail to start
127127
#pid: /var/run/nginx.pid # Directory location must exist (i.e. it's /run/nginx.pid on EL7)
128128
events:
129-
worker_connections: 768
129+
worker_connections: 1024
130130
http:
131131
sendfile: 'on'
132132
include:
133133
#### Note: Syntax issues in these files generate nginx [emerg] errors on startup. ####
134134
- /etc/nginx/mime.types
135135

136-
### module ngx_http_log_module example
137-
log_format: |-
138-
main '...';
139-
access_log /var/log/nginx/access_log main
140-
access_log: [] #suppress default access_log option from being added
136+
### module ngx_http_log_module example
137+
log_format: |-
138+
main '...';
139+
access_log /var/log/nginx/access_log main
140+
access_log: [] #suppress default access_log option from being added
141141

142142
### module nngx_stream_core_module
143143
### https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/#example
@@ -208,7 +208,7 @@ nginx:
208208
- location ~ .htm:
209209
- try_files: '$uri $uri/ =404'
210210
- test: something else
211-
- include 'snippets/letsencrypt.conf'
211+
- include: 'snippets/letsencrypt.conf'
212212

213213
# Or a slightly more compact alternative syntax:
214214

@@ -221,7 +221,7 @@ nginx:
221221
- location ~ .htm:
222222
- try_files: '$uri $uri/ =404'
223223
- test: something else
224-
- include 'snippets/letsencrypt.conf'
224+
- include: 'snippets/letsencrypt.conf'
225225

226226
# both of those output:
227227
# server {

0 commit comments

Comments
 (0)