Skip to content

Add service include feature #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add service include feature #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dbfe70
test(pillar.example): add `includes`
kees-closed Jun 10, 2023
124ad06
feat(service): add option to include existing services into a service
kees-closed May 7, 2024
02f55df
fix(service): no need to add include statement twice
kees-closed May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions firewalld/files/service.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,9 @@
{%- endfor %}
{%- endif %}
{%- endif %}
{%- if 'includes' in service %}
{%- for v in service.includes %}
<include service="{{ v }}" />
{%- endfor %}
{%- endif %}
</service>
2 changes: 2 additions & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ firewalld:
ipv6:
- ff02::fb
- ff02::fc
includes:
- dhcp

zabbixcustom:
short: Zabbixcustom
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/almalinux-8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ values:
source_ports:
tcp:
- 21
includes:
- dhcp
zabbixcustom:
description: zabbix custom rule
ports:
Expand Down