Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pillar fixes #217

Merged
merged 9 commits into from
Apr 11, 2019
Merged

Pillar fixes #217

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
000c96a
pillar.example: an include was missing a colon
Apr 10, 2019
3b90619
pillar.example: 2 directives not indented properly
Apr 10, 2019
ba04fc9
pillar.example: added the stock log_format
Apr 10, 2019
44f9b44
pillar.example: make log path match map.jinja
Apr 10, 2019
646335c
pillar.example: worker_connections value from latest mainline nginx
Apr 10, 2019
3f604f6
pillar.example: fixed other uses of include
Apr 10, 2019
f276a60
pillar.example: corrected formatting
Apr 11, 2019
ed71555
pillar.example: corrected log_format
Apr 11, 2019
8d7d1ac
pillar.example: reset log_format to try another day
Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pillar.example
View file
Open in desktop
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'
garrettw marked this conversation as resolved.
Show resolved Hide resolved
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