Skip to content

Commit

Permalink
Pillar fixes (#217)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
garrettw authored and myii committed Apr 11, 2019
1 parent 8ded496 commit 62e8ac0
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,26 @@ 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
worker_processes: 4
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:
#### Note: Syntax issues in these files generate nginx [emerg] errors on startup. ####
- /etc/nginx/mime.types

### module ngx_http_log_module example
log_format: |-
main '...';
access_log /var/log/nginx/access_log main
access_log: [] #suppress default access_log option from being added
### module ngx_http_log_module example
log_format: |-
main '...';
access_log /var/log/nginx/access_log main
access_log: [] #suppress default access_log option from being added

### module nngx_stream_core_module
### https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/#example
Expand Down Expand Up @@ -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:

Expand All @@ -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 {
Expand Down

0 comments on commit 62e8ac0

Please sign in to comment.