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

Merge pull request #192 from morsik/patch-1

Browse Source 
Allow to use load_module directly
This commit is contained in:
Niels Abspoel 2018-06-29 12:59:01 +02:00 committed by GitHub
commit a5624627dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/ng/files/nginx.conf
View File

@ -32,6 +32,10 @@
# #
# This file is managed by Salt. # This file is managed by Salt.
{% if 'load_module' in config.keys() %}
{{ nginx_block(config.pop('load_module'), 'load_module') }}
{%- endif -%}
{% if 'include' in config.keys() %} {% if 'include' in config.keys() %}
{{ nginx_block(config.pop('include'), 'include') }} {{ nginx_block(config.pop('include'), 'include') }}
{%- endif -%} {%- endif -%}

1
pillar.example
View File

@ -85,6 +85,7 @@ nginx:
# 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
worker_processes: 4 worker_processes: 4
load_module: modules/ngx_http_lua_module.so # this will be passed very first in configuration; otherwise nginx will fail to start
pid: /var/run/nginx.pid ### Directory location must exist pid: /var/run/nginx.pid ### Directory location must exist
events: events:
worker_connections: 768 worker_connections: 768