Merge pull request #36 from miska/master

Allow more services definition inside zone
This commit is contained in:
Imran Iqbal 2020-02-12 19:03:07 +00:00 committed by GitHub
commit 0d0f191449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View File

@ -33,11 +33,13 @@
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{%- if 'services' in zone %} {%- for k,val in zone.items() %}
{%- for v in zone.services %} {%- if k.endswith("services") %}
{%- for v in val %}
<service name="{{ v }}" /> <service name="{{ v }}" />
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{%- endfor %}
{%- if 'ports' in zone %} {%- if 'ports' in zone %}
{%- for v in zone.ports %} {%- for v in zone.ports %}
{%- if 'comment' in v %} {%- if 'comment' in v %}

View File

@ -107,10 +107,12 @@ firewalld:
are accepted. are accepted.
services: services:
- http - http
- zabbixcustom
- https - https
- ssh - ssh
- salt-minion - salt-minion
# Anything in zone definition ending with services will get merged into services
other_services:
- zabbixcustom
protocols: protocols:
- igmp - igmp
rich_rules: rich_rules: