diff --git a/network/firewall.sls b/network/firewall.sls index 8c91c7d..ad27738 100644 --- a/network/firewall.sls +++ b/network/firewall.sls @@ -9,6 +9,7 @@ network_firewall_rules: - source: salt://{{ tpldir }}/files/firewall_rules.nft.jinja - template: jinja - context: + sls: {{ sls }} ALLOWED_PORTS: [80, 443, 25565, 51871] - user: root - group: root diff --git a/nginx/pkg.sls b/nginx/pkg.sls index 11e4a2c..3f95ef6 100644 --- a/nginx/pkg.sls +++ b/nginx/pkg.sls @@ -11,6 +11,7 @@ nginx_pkg_config: - source: salt://{{ tpldir }}/files/nginx.conf.jinja - template: jinja - context: + sls: {{ sls }} log_dir: {{ nginx.log_dir }} sites_enabled_dir: {{ nginx.sites_enabled_dir }} - require: diff --git a/nginx/service.sls b/nginx/service.sls index 4044797..1185ec1 100644 --- a/nginx/service.sls +++ b/nginx/service.sls @@ -4,6 +4,6 @@ include: nginx_service_running: service.running: - name: nginx - - enabled: True + - enable: True - require: - nginx_pkg_pkgs