Quellcode durchsuchen

Merge pull request #192 from morsik/patch-1

Allow to use load_module directly
tags/v0.55.0
Niels Abspoel vor 6 Jahren
Ursprung
Commit
a5624627dc
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
2 geänderte Dateien mit 5 neuen und 0 gelöschten Zeilen
  1. +4
    -0
      nginx/ng/files/nginx.conf
  2. +1
    -0
      pillar.example

+ 4
- 0
nginx/ng/files/nginx.conf Datei anzeigen

@@ -32,6 +32,10 @@
#
# 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() %}
{{ nginx_block(config.pop('include'), 'include') }}
{%- endif -%}

+ 1
- 0
pillar.example Datei anzeigen

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

Laden…
Abbrechen
Speichern