Ref: https://github.com/saltstack-formulas/packages-formula/pull/74 === Do not change lines below === { "chain": [], "cmd": "git ls-files -z firewalld | xargs --null -I '()' find '()' -type f -print0 | xargs --null sed --in-place --regexp-extended 's#\"firewalld/#\"./#g;s#- firewalld\\.#- .#;'", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^pull/53/head
@@ -2,7 +2,7 @@ | |||
# | |||
# This state ensures that /etc/firewalld/backends/ exists. | |||
# | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
{% set backend_manage = firewalld.backend.manage %} | |||
{% set backend_pkg = firewalld.backend.pkg %} |
@@ -2,7 +2,7 @@ | |||
# | |||
# This state configures firewalld. | |||
# | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
directory_firewalld: | |||
file.directory: # make sure this is a directory |
@@ -1,4 +1,4 @@ | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
firewalld_repo_buster-backports: | |||
pkgrepo.managed: |
@@ -1,6 +1,6 @@ | |||
# == State: firewalld.direct | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
# == Define: firewalld.direct |
@@ -3,7 +3,7 @@ | |||
# | |||
# This state installs/runs firewalld. | |||
# | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
{% if salt['grains.get']('osfullname') == "SLES" and salt['grains.get']('osmajorrelease')|int < 15 %} | |||
@@ -17,14 +17,14 @@ firewalld-unsupported: | |||
include: | |||
{% if grains.get('osfinger', '') == 'Debian-10' %} | |||
- firewalld.debian10 | |||
- .debian10 | |||
{% endif %} | |||
- firewalld.config | |||
- firewalld.ipsets | |||
- firewalld.backend | |||
- firewalld.services | |||
- firewalld.zones | |||
- firewalld.direct | |||
- .config | |||
- .ipsets | |||
- .backend | |||
- .services | |||
- .zones | |||
- .direct | |||
# iptables service that comes with rhel/centos | |||
iptables: |
@@ -2,7 +2,7 @@ | |||
# | |||
# This state ensures that /etc/firewalld/ipsets/ exists. | |||
# | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
# Backward compatibility setting and deprecation notices | |||
{% set ipset_manage = false %} |
@@ -2,11 +2,11 @@ | |||
# vim: ft=jinja | |||
{#- Start with defaults from defaults.yaml #} | |||
{% import_yaml "firewalld/defaults.yaml" as default_settings %} | |||
{% import_yaml "firewalld/osarchmap.yaml" as osarchmap %} | |||
{% import_yaml "firewalld/osfamilymap.yaml" as osfamilymap %} | |||
{% import_yaml "firewalld/osmap.yaml" as osmap %} | |||
{% import_yaml "firewalld/osfingermap.yaml" as osfingermap %} | |||
{% import_yaml "./defaults.yaml" as default_settings %} | |||
{% import_yaml "./osarchmap.yaml" as osarchmap %} | |||
{% import_yaml "./osfamilymap.yaml" as osfamilymap %} | |||
{% import_yaml "./osmap.yaml" as osmap %} | |||
{% import_yaml "./osfingermap.yaml" as osfingermap %} | |||
{% set _config = salt['config.get']('firewalld', default={}) %} | |||
@@ -2,7 +2,7 @@ | |||
# | |||
# This state ensures that /etc/firewalld/services/ exists. | |||
# | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
directory_firewalld_services: | |||
file.directory: # make sure this is a directory |
@@ -2,7 +2,7 @@ | |||
# | |||
# This state ensures that /etc/firewalld/zones/ exists. | |||
# | |||
{% from "firewalld/map.jinja" import firewalld with context %} | |||
{% from "./map.jinja" import firewalld with context %} | |||
directory_firewalld_zones: | |||
file.directory: # make sure this is a directory |