fix(service): don't reload ufw service if service is disabled

saltstack-formulas · Jul 20, 2020 · c953630 · c953630
1 parent 830b8fe
commit c953630
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/ufw/config/applications.sls b/ufw/config/applications.sls
@@ -8,6 +8,8 @@
 {%- set sls_reload_service  = tplroot ~ '.service.reload' %}
 {%- from tplroot ~ "/map.jinja" import ufw with context %}
 
+{%- set enabled = ufw.get('enabled', False) %}
+
 include:
   - {{ sls_package_install }}
   - {{ sls_enable_service }}
@@ -44,8 +46,9 @@ ufw-app-{{ method }}-{{ app_name }}:
     {%- if comment is not none and salt['grains.get']('osfinger') != 'Debian-8' and salt['grains.get']('osfinger') != 'CentOS-6' %}
     - comment: '"{{ comment }}"'
     {%- endif %}
+    {%- if enabled %}
     - listen_in:
       - cmd: reload-ufw
-
+    {%- endif %}
   {%- endfor %}
 {%- endfor %}
diff --git a/ufw/config/interfaces.sls b/ufw/config/interfaces.sls
@@ -8,6 +8,8 @@
 {%- set sls_reload_service  = tplroot ~ '.service.reload' %}
 {%- from tplroot ~ "/map.jinja" import ufw with context %}
 
+{%- set enabled = ufw.get('enabled', False) %}
+
 include:
   - {{ sls_package_install }}
   - {{ sls_enable_service }}
@@ -23,7 +25,8 @@ ufw-interface-{{ interface_name }}:
     {%- if comment is not none %}
     - comment: '"{{ comment }}"'
     {%- endif %}
+    {%- if enabled %}
     - listen_in:
       - cmd: reload-ufw
-
+    {%- endif %}
 {%- endfor %}
diff --git a/ufw/config/open.sls b/ufw/config/open.sls
@@ -8,6 +8,8 @@
 {%- set sls_reload_service  = tplroot ~ '.service.reload' %}
 {%- from tplroot ~ "/map.jinja" import ufw with context %}
 
+{%- set enabled = ufw.get('enabled', False) %}
+
 include:
   - {{ sls_package_install }}
   - {{ sls_enable_service }}
@@ -23,7 +25,8 @@ ufw-open-{{ open_addr }}:
     {%- if comment is not none %}
     - comment: '"{{ comment }}"'
     {%- endif %}
+    {%- if enabled %}
     - listen_in:
       - cmd: reload-ufw
-
+    {%- endif %}
 {%- endfor %}
diff --git a/ufw/config/services.sls b/ufw/config/services.sls
@@ -8,6 +8,8 @@
 {%- set sls_reload_service  = tplroot ~ '.service.reload' %}
 {%- from tplroot ~ "/map.jinja" import ufw with context %}
 
+{%- set enabled = ufw.get('enabled', False) %}
+
 include:
   - {{ sls_package_install }}
   - {{ sls_enable_service }}
@@ -49,8 +51,9 @@ ufw-svc-{{ method }}-{{ service_name }}-{{ from_addr }}:
     - comment: '"{{ comment }}"'
     {%- endif %}
     - to_port: "{{ to_port }}"
+    {%- if enabled %}
     - listen_in:
       - cmd: reload-ufw
-
+    {%- endif %}
   {%- endfor %}
 {%- endfor %}