Steven Daniele
94d2b0b97c
fix: do not error on unknown os_family grain
If the formula was ran on a system that reported an os_family that
wasn't one of "Debian", "RedHat", "Arch", "Suse" then the map.jinja
template would fail to render with "'NoneType' is not iterable.
This occurs because grains.filter_by will return None when it fails
match the grain to the input dictionary. The value is then blindly
passed into a dict.update() which causes the failure.
In this patch we ensure that the default values, as defined in
defaults.yaml, are always applied when grain matching fails.
преди 4 години
semantic-release-bot
80587f9671
chore(release): 0.10.1 [skip ci]
## [0.10.1](https://github.com/saltstack-formulas/firewalld-formula/compare/v0.10.0...v0.10.1 ) (2020-04-18)
### Tests
* verify map output using `yaml_dump` ([69df9a6
](69df9a62d6
))
преди 4 години
Imran Iqbal
51873948c2
Merge pull request #42 from myii/test/verify-yaml_dump
test: verify map output using `yaml_dump`
преди 4 години
Imran Iqbal
69df9a62d6
test: verify map output using `yaml_dump`
* Semi-automated using https://github.com/myii/ssf-formula/pull/159
преди 4 години
Imran Iqbal
95e26621f9
chore(rubocop): use org-wide standard settings for `Metrics/BlockLength` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/158
преди 4 години
semantic-release-bot
6ced9d9cfa
chore(release): 0.10.0 [skip ci]
# [0.10.0](https://github.com/saltstack-formulas/firewalld-formula/compare/v0.9.0...v0.10.0 ) (2020-04-02)
### Bug Fixes
* **zone.xml:** adjust whitespacing to pass tests & macro at top of file ([d8f0f47
](d8f0f47a54
))
### Features
* allow rich_rules to be specified as a dict ([cd4cec0
](cd4cec0089
))
### Styles
* **zone.xml:** remove all trailing whitespaces ([204efe5
](204efe5fc7
))
### Tests
* **zones_spec:** check content of rendered zone files ([6ebfc6f
](6ebfc6f20c
))
преди 4 години
Imran Iqbal
5c135df025
Merge pull request #40 from Sxderp/pr-add-dictionary-rich-rules2
Allow rich_rules to be specified as a dictionary
преди 4 години
Imran Iqbal
c69fd6bf04
chore(rubocop): relax `Metrics/BlockLength` for new tests
* Checked using https://github.com/myii/ssf-formula/pull/145
преди 4 години
Imran Iqbal
204efe5fc7
style(zone.xml): remove all trailing whitespaces
преди 4 години
Imran Iqbal
d8f0f47a54
fix(zone.xml): adjust whitespacing to pass tests & macro at top of file
преди 4 години
Imran Iqbal
6ebfc6f20c
test(zones_spec): check content of rendered zone files
преди 4 години
Steven Daniele
cd4cec0089
feat: allow rich_rules to be specified as a dict
When specifying rich rules as a dictionary ipsets and services can be
specified as lists. They will be expanded out by the jinja template into
individual rich rules for the parent zone.
преди 4 години
Imran Iqbal
cf21ccab97
chore(gitignore): update from the `template-formula` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/132
преди 4 години
Imran Iqbal
d02f890fb4
chore(rubocop): move `LineLength` cop from `Metrics` to `Layout` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/129
преди 4 години
semantic-release-bot
91362086a8
chore(release): 0.9.0 [skip ci]
# [0.9.0](https://github.com/saltstack-formulas/firewalld-formula/compare/v0.8.0...v0.9.0 ) (2020-02-12)
### Features
* **zone.xml:** allow more services definition inside zone ([8d0172f
](8d0172f5c7
))
преди 4 години
Imran Iqbal
0d0f191449
Merge pull request #36 from miska/master
Allow more services definition inside zone
преди 4 години
semantic-release-bot
7ff891796a
chore(release): 0.8.0 [skip ci]
# [0.8.0](https://github.com/saltstack-formulas/firewalld-formula/compare/v0.7.0...v0.8.0 ) (2020-02-12)
### Continuous Integration
* workaround issues with newly introduced `amazonlinux-1` [skip ci] ([ace3433
](ace343353d
))
* workaround issues with newly introduced `amazonlinux-1` [skip ci] ([b5a95f3
](b5a95f35ab
))
* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([908f5df
](908f5df86c
))
* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([0b82e43
](0b82e43a15
))
* **travis:** apply changes from build config validation [skip ci] ([6e1b876
](6e1b876298
))
* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([70dc9aa
](70dc9aa3b4
))
* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([97afbb1
](97afbb1575
))
* **travis:** run `shellcheck` during lint job [skip ci] ([d8bede7
](d8bede7082
))
* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([b96cc56
](b96cc569fe
))
* **travis:** use build config validation (beta) [skip ci] ([07e7900
](07e79001cd
))
### Features
* standardize license and hand over to saltstack formulas ([20cb8a6
](20cb8a60d3
))
преди 4 години
David Bezuidenhout
20cb8a60d3
feat: standardize license and hand over to saltstack formulas
преди 4 години
Imran Iqbal
ebd46bea31
Merge branch '20200212142439' into upstream
преди 4 години
Imran Iqbal
ace343353d
ci: workaround issues with newly introduced `amazonlinux-1` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/127
преди 4 години
Imran Iqbal
b5a95f35ab
ci: workaround issues with newly introduced `amazonlinux-1` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/127
преди 4 години
Michal Hrusecky
8d0172f5c7
feat(zone.xml): allow more services definition inside zone
Now multiple sections ending with `services` can be defined for each in pillar
and all of them will get merged into one service block in the zone. The goal is
to keep backward compatibility while allowing different services to be defined
in different pillars. So basically have various parts of the pillar affecting
the firewall without need to define everything centrally. Helpful for the
exceptions to the rules.
преди 4 години
Imran Iqbal
0b82e43a15
ci(kitchen): avoid using bootstrap for `master` instances [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/124
преди 4 години
Imran Iqbal
b96cc569fe
ci(travis): use `major.minor` for `semantic-release` version [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/112
преди 4 години
Imran Iqbal
908f5df86c
ci(gemfile): restrict `train` gem version until upstream fix [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/110
преди 5 години
Imran Iqbal
97afbb1575
ci(travis): quote pathspecs used with `git ls-files` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/107
преди 5 години
Imran Iqbal
d8bede7082
ci(travis): run `shellcheck` during lint job [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/106
преди 5 години
Imran Iqbal
70dc9aa3b4
ci(travis): opt-in to `dpl v2` to complete build config validation [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/100
преди 5 години
Imran Iqbal
6e1b876298
ci(travis): apply changes from build config validation [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/98
преди 5 години
Imran Iqbal
07e79001cd
ci(travis): use build config validation (beta) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/97
преди 5 години
semantic-release-bot
dc8a9df3b8
chore(release): 0.7.0 [skip ci]
# [0.7.0](https://github.com/saltstack-formulas/firewalld-formula/compare/v0.6.2...v0.7.0 ) (2019-11-09)
### Bug Fixes
* **map.jinja:** fix `salt-lint` errors ([de4e191
](de4e1915fb
))
* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([8136b75
](8136b75fa0
))
* **yamllint:** fix all errors ([0f808d6
](0f808d6afb
))
### Documentation
* **readme:** modify according to standard structure ([3df11fc
](3df11fc75c
))
* **readme:** move to `docs/` directory ([d47265f
](d47265f974
))
### Features
* **semantic-release:** implement for this formula ([c5f114d
](c5f114d886
))
преди 5 години
Niels Abspoel
cf901ef465
Merge pull request #33 from myii/feat/implement-semantic-release
feat(semantic-release): implement for this formula
преди 5 години
Imran Iqbal
3df11fc75c
docs(readme): modify according to standard structure
преди 5 години
Imran Iqbal
d47265f974
docs(readme): move to `docs/` directory
преди 5 години
Imran Iqbal
8136b75fa0
fix(rubocop): add fixes using `rubocop --safe-auto-correct`
преди 5 години
Imran Iqbal
0f808d6afb
fix(yamllint): fix all errors
```bash
firewalld-formula$ yamllint -s .
./pillar.example
2:1 warning missing document start "---" (document-start)
3:12 warning truthy value should be one of [false, true] (truthy)
12:13 warning truthy value should be one of [false, true] (truthy)
15:89 error line too long (108 > 88 characters) (line-length)
19:13 warning truthy value should be one of [false, true] (truthy)
30:89 error line too long (363 > 88 characters) (line-length)
96:89 error line too long (170 > 88 characters) (line-length)
108:15 error wrong indentation: expected 12 but found 14 (indentation)
115:13 error empty value in block mapping (empty-values)
116:2 error syntax error: found character '%' that cannot start any token
152:89 error line too long (112 > 88 characters) (line-length)
./firewalld/defaults.yaml
3:1 warning missing document start "---" (document-start)
```
преди 5 години
Imran Iqbal
de4e1915fb
fix(map.jinja): fix `salt-lint` errors
```bash
Examining firewalld/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:4
{## Start with defaults from defaults.yaml ##}
[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:7
{##
[201] Trailing whitespace
firewalld/map.jinja:16
}, grain='os_family', merge=salt['pillar.get']('firewalld:lookup'))
[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:19
{## Merge the flavor_map to the default settings ##}
[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:22
{## Merge in salt:lookup pillar ##}
```
преди 5 години
Imran Iqbal
c5f114d886
feat(semantic-release): implement for this formula
* Automated using https://github.com/myii/ssf-formula/pull/95
преди 5 години
Imran Iqbal
db9597e398
Merge pull request #32 from Sxderp/pr-remove-unexpected-icmp-block-attribtue
Remove name attribute in icmp-block-inversion
преди 5 години
Steven Daniele
12b696a8fe
Remove name attribute in icmp-block-inversion
Firewalld does not parse the name attribute.
Log message:
firewalld[1999]: ERROR: Failed to load zone file 'public.xml':
PARSE_ERROR: icmp-block-inversion: Unexpected attribute name
преди 5 години
Imran Iqbal
9646ead4b4
Merge pull request #31 from Sxderp/pr-fix-block-inversion-key-name
Fix typo in icmp block inversion key name
преди 5 години
Steven Daniele
64825e20ab
Fix typo in icmp block inversion key name
преди 5 години
Niels Abspoel
ae1f2453d3
add updated firewalld.conf from 0.7.1
преди 5 години
Niels Abspoel
4937787038
Merge pull request #29 from noelmcloughlin/arch
feat(linux): archlinux support (no osfinger grain)
преди 5 години
N
ad37448038
feat(linux): archlinux support (no osfinger grain)
преди 5 години
Imran Iqbal
46288d6b50
Merge pull request #28 from aboe76/update_test_images
update test images
преди 5 години
Niels Abspoel
f560dcd1b4
add @myii recommendations
преди 5 години
Niels Abspoel
d201f448c9
update test images
преди 5 години
Imran Iqbal
6a546ca192
Merge pull request #27 from aboe76/improve_service
update service and zones with more options
преди 5 години
Niels Abspoel
a438f30f50
fix spacing in closing tags
преди 5 години