forked from tinuva/firewalld-formula
-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: split default maps into separate files
While the default maps are mostly empty this sets the groundwork for distribution specific defaults. The layout is based on the formula template. BREAKING CHANGE: `map.jinja` has been upgraded from using `pillar.get` to `config.get`.
- Loading branch information
Showing
6 changed files
with
176 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,18 @@ | ||
# -*- coding: utf-8 -*- | ||
# vim: ft=yaml | ||
--- | ||
default: | ||
firewalld: | ||
enabled: true | ||
package: firewalld | ||
service: firewalld | ||
config: /etc/firewalld.conf | ||
firewalld: | ||
enabled: true | ||
package: firewalld | ||
service: firewalld | ||
config: /etc/firewalld.conf | ||
|
||
ipset: | ||
manage: false | ||
pkg: ipset | ||
ipset: | ||
manage: false | ||
pkg: ipset | ||
|
||
backend: | ||
manage: false | ||
pkg: nftables | ||
backend: | ||
manage: false | ||
pkg: nftables | ||
|
||
ipsets: {} | ||
ipsets: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# -*- coding: utf-8 -*- | ||
# vim: ft=yaml | ||
# | ||
# Setup variables using grains['osarch'] based logic. | ||
# You just need to add the key:values for an `osarch` that differ | ||
# from `defaults.yaml`. | ||
# Only add an `osarch` which is/will be supported by the formula. | ||
# | ||
# If you do not need to provide defaults via the `osarch` grain, | ||
# you will need to provide at least an empty dict in this file, e.g. | ||
# osarch: {} | ||
--- | ||
amd64: | ||
arch: amd64 | ||
|
||
x86_64: | ||
arch: amd64 | ||
|
||
386: | ||
arch: 386 | ||
|
||
arm64: | ||
arch: arm64 | ||
|
||
armv6l: | ||
arch: armv6l | ||
|
||
armv7l: | ||
arch: armv7l | ||
|
||
ppc64le: | ||
arch: ppc64le | ||
|
||
s390x: | ||
arch: s390x |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,33 @@ | ||
# -*- coding: utf-8 -*- | ||
# # vim: ft=yaml | ||
# os_family defaults | ||
# only add key:values here that differ from whats in defaults.yaml | ||
# vim: ft=yaml | ||
# | ||
# Setup variables using grains['os_family'] based logic. | ||
# You just need to add the key:values for an `os_family` that differ | ||
# from `defaults.yaml` + `osarch.yaml`. | ||
# Only add an `os_family` which is/will be supported by the formula. | ||
# | ||
# If you do not need to provide defaults via the `os_family` grain, | ||
# you will need to provide at least an empty dict in this file, e.g. | ||
# osfamilymap: {} | ||
--- | ||
Debian: | ||
firewalld: {} | ||
RedHat: | ||
firewalld: {} | ||
Arch: | ||
firewalld: {} | ||
Suse: | ||
firewalld: {} | ||
Debian: {} | ||
|
||
RedHat: {} | ||
|
||
Suse: {} | ||
|
||
Gentoo: {} | ||
|
||
Arch: {} | ||
|
||
Alpine: {} | ||
|
||
FreeBSD: {} | ||
|
||
OpenBSD: {} | ||
|
||
Solaris: {} | ||
|
||
Windows: {} | ||
|
||
MacOS: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# -*- coding: utf-8 -*- | ||
# vim: ft=yaml | ||
# | ||
# Setup variables using grains['osfinger'] based logic. | ||
# You just need to add the key:values for an `osfinger` that differ | ||
# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml` + `osmap.yaml`. | ||
# Only add an `osfinger` which is/will be supported by the formula. | ||
# | ||
# If you do not need to provide defaults via the `os_finger` grain, | ||
# you will need to provide at least an empty dict in this file, e.g. | ||
# osfingermap: {} | ||
--- | ||
# os: Debian | ||
Debian-10: {} | ||
Debian-9: {} | ||
Debian-8: {} | ||
|
||
# os: Ubuntu | ||
Ubuntu-18.04: {} | ||
Ubuntu-16.04: {} | ||
|
||
# os: Fedora | ||
Fedora-31: {} | ||
Fedora-30: {} | ||
|
||
# os: CentOS | ||
CentOS Linux-8: {} | ||
CentOS Linux-7: {} | ||
CentOS-6: {} | ||
|
||
# os: Amazon | ||
Amazon Linux-2: {} | ||
Amazon Linux AMI-2018: {} | ||
|
||
# os: SUSE | ||
Leap-15: {} | ||
|
||
# os: FreeBSD | ||
FreeBSD-12: {} | ||
|
||
# os: Windows | ||
Windows-8.1: {} | ||
|
||
# os: Gentoo | ||
Gentoo-2: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# -*- coding: utf-8 -*- | ||
# vim: ft=yaml | ||
# | ||
# Setup variables using grains['os'] based logic. | ||
# You just need to add the key:values for an `os` that differ | ||
# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml`. | ||
# Only add an `os` which is/will be supported by the formula. | ||
# | ||
# If you do not need to provide defaults via the `os` grain, | ||
# you will need to provide at least an empty dict in this file, e.g. | ||
# osmap: {} | ||
--- | ||
# os_family: Debian | ||
Ubuntu: {} | ||
Raspbian: {} | ||
|
||
# os_family: RedHat | ||
Fedora: {} | ||
CentOS: {} | ||
Amazon: {} | ||
|
||
# os_family: Suse | ||
SUSE: {} | ||
openSUSE: {} | ||
|
||
# os_family: Gentoo | ||
Funtoo: {} | ||
|
||
# os_family: Arch | ||
Manjaro: {} | ||
|
||
# os_family: Solaris | ||
SmartOS: {} |