diff --git a/nginx/snippets.sls b/nginx/snippets.sls index 1c57ccb..bd881a9 100644 --- a/nginx/snippets.sls +++ b/nginx/snippets.sls @@ -14,7 +14,7 @@ nginx_snippets_dir: {% for snippet, config in nginx.snippets.items() %} nginx_snippet_{{ snippet }}: file.managed: - - name: {{ nginx.lookup.snippets_dir ~ '/' ~ snippet ~ '.conf' }} + - name: {{ nginx.lookup.snippets_dir ~ '/' ~ snippet }} - source: {{ files_switch([ snippet, 'server.conf' ], 'nginx_snippet_file_managed' ) diff --git a/pillar.example b/pillar.example index 4ecc9ec..975688e 100644 --- a/pillar.example +++ b/pillar.example @@ -63,15 +63,15 @@ nginx: ## Files or Templates can be retrieved by TOFS with snippet name ( Fallback to server.conf ) ##--- --- - - - - - - -- - - -- -- - - --- -- - -- - - - -- - - - - -- - - - -- - - - -- - ## snippets: - letsencrypt: + letsencrypt.conf: - location ^~ /.well-known/acme-challenge/: - proxy_pass: http://localhost:9999 - cloudflare_proxy: + cloudflare_proxy.conf: - set_real_ip_from: 103.21.244.0/22 - set_real_ip_from: 103.22.200.0/22 - set_real_ip_from: 104.16.0.0/12 - set_real_ip_from: 108.162.192.0/18 - blacklist: + blacklist.conf: - map $http_user_agent $bad_bot: - default: 0 - '~*^Lynx': 0 @@ -81,7 +81,7 @@ nginx: - '~*bandit': 1 - libwww-perl: 1 - '~(?i)(httrack|htmlparser|libwww)': 1 - upstream_netdata_tcp: + upstream_netdata_tcp.conf: - upstream netdata: - server: 127.0.0.1:19999 - keepalive: 64 diff --git a/test/salt/default/pillar/nginx.sls b/test/salt/default/pillar/nginx.sls index 0439343..bbdfa69 100644 --- a/test/salt/default/pillar/nginx.sls +++ b/test/salt/default/pillar/nginx.sls @@ -6,7 +6,7 @@ nginx: snippets: - letsencrypt: + letsencrypt.conf: - location ^~ /.well-known/acme-challenge/: - proxy_pass: http://localhost:9999 server: