paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated nginx state

Browse Source
This commit is contained in:
Paul 2021-08-19 09:55:49 +02:00
parent 63f60151df
commit 9903011ba9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
states/nginx/config.sls
View File

@ -51,7 +51,7 @@ nginx-sites-available-{{ key }}:
proxy_pass: {{ vhost.proxy_pass|default("") }} proxy_pass: {{ vhost.proxy_pass|default("") }}
cache: {{ vhost.cache|default(true) }} cache: {{ vhost.cache|default(true) }}
autoindex: {{ vhost.autoindex|default(false) }} autoindex: {{ vhost.autoindex|default(false) }}
root_dir: {{ vhost.root_dir|default(None) }} root_dir: {{ vhost.root_dir|default(none) }}
internal_access: {{ vhost.internal_access|default(false) }} internal_access: {{ vhost.internal_access|default(false) }}
dirs: {{ vhost.dirs|default([]) }} dirs: {{ vhost.dirs|default([]) }}
php_socket_file: {{ nginx.config.php_socket_file }} php_socket_file: {{ nginx.config.php_socket_file }}

2
states/nginx/map.jinja
View File

@ -2,4 +2,4 @@
{%- set nginx = salt['pillar.get']('nginx', default=defaults.nginx, merge=True) %} {%- set nginx = salt['pillar.get']('nginx', default=defaults.nginx, merge=True) %}
{%- set net = salt['pillar.get']('net', merge=True) %} {%- set net = salt['pillar.get']('net') %}

5
states/nginx/templates/access.j2
View File

@ -1,8 +1,9 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
{%- for key, value in salt['pillar.get']('net:ipv4_networks').items() %} {%- from "nginx/map.jinja" import net with context %}
{%- for key, value in net.ipv4_networks.items() %}
allow {{ value.ip }}/{{ value.mask }}; allow {{ value.ip }}/{{ value.mask }};
{%- endfor %} {%- endfor %}
{%- for key, value in salt['pillar.get']('net:ipv6_networks').items() %} {%- for key, value in net.ipv6_networks.items() %}
allow {{ value.ip }}/{{ value.mask }}; allow {{ value.ip }}/{{ value.mask }};
{%- endfor %} {%- endfor %}
deny all; deny all;