diff --git a/firewalld/files/direct.xml b/firewalld/files/direct.xml index 97c4077..1fbce20 100644 --- a/firewalld/files/direct.xml +++ b/firewalld/files/direct.xml @@ -1,4 +1,9 @@ + {%- if 'chain' in direct %} {%- for k, v in direct.chain.items() %} diff --git a/firewalld/files/firewalld.conf b/firewalld/files/firewalld.conf index 7bf9ee5..52190d6 100644 --- a/firewalld/files/firewalld.conf +++ b/firewalld/files/firewalld.conf @@ -1,4 +1,9 @@ {% set firewalld = pillar.get('firewalld', {}) -%} +# +# This file is managed/generated by salt. +# Do not edit this file manually, it will be overwritten! +# Modify the salt pillar for firewalld instead +# # firewalld config file # default zone diff --git a/firewalld/files/ipset.xml b/firewalld/files/ipset.xml index 204cce7..81aedc3 100644 --- a/firewalld/files/ipset.xml +++ b/firewalld/files/ipset.xml @@ -1,4 +1,9 @@ + {%- if 'short' in ipset %} {{ ipset.short }} diff --git a/firewalld/files/service.xml b/firewalld/files/service.xml index 5008ab2..7f82938 100644 --- a/firewalld/files/service.xml +++ b/firewalld/files/service.xml @@ -1,4 +1,9 @@ + {% if 'short' in service %}{{ service.short }}{%- else %}{{ name }}{%- endif %} {% if 'description' in service %}{{ service.description }}{%- endif %} diff --git a/firewalld/files/zone.xml b/firewalld/files/zone.xml index 2800d75..b7ede9a 100644 --- a/firewalld/files/zone.xml +++ b/firewalld/files/zone.xml @@ -1,4 +1,9 @@ + {% if 'short' in zone %}{{ zone.short }}{% else %}{{ name }}{% endif %} {% if 'description' in zone %}{{ zone.description }}{% endif %}