Commit Graph

52 Commits

Author SHA1 Message Date
Javier Bértoli
d3928d1be0 Refactor ipset format, add backward compatibility
See https://github.com/saltstack-formulas/firewalld-formula/pull/21#pullrequestreview-146958098
2018-08-25 18:27:37 -03:00
Javier Bértoli
7bc3a9cdd4 Use mapped data instead of pillar.get data 2018-08-25 18:20:27 -03:00
Javier Bértoli
bcd47361ca Refactor .kitchen.yml to use pillar.example as pillar 2018-08-25 18:13:06 -03:00
Javier Bértoli
e513275112 Updated REDME 2018-08-25 16:16:01 -03:00
Javier Bértoli
b641216b8b Update testing environment 2018-08-25 16:08:24 -03:00
Javier Bértoli
8694a11de5
Merge pull request #21 from aboe76/update_config_6.x
update firewalld formula for firewalld > 0.6
2018-08-16 15:19:46 -03:00
Niels Abspoel
7c0b6aeb55 fix whitespacing 2018-08-14 19:52:08 +02:00
Niels Abspoel
36da1094b7 update firewalld formula for firewalld > 0.6 2018-08-12 20:26:21 +02:00
Niels Abspoel
1ddb09137c
Merge pull request #20 from noelmcloughlin/suseSupport
notify nosupport if SLES version < 15
2018-06-05 17:04:53 +02:00
N
1ba51b8583 notify nosupport if SLES version < 15 2018-06-05 15:36:29 +01:00
Niels Abspoel
1038546745
Merge pull request #19 from noelmcloughlin/renamefile
fix filename
2018-06-01 21:23:25 +02:00
N
ac07060c6f fix filename 2018-06-01 19:19:12 +01:00
Niels Abspoel
31ad6eb4c2
Merge pull request #17 from saltstack-formulas/revert-16-master
Revert "Fix ipset:type colon handling error"
2018-05-13 22:15:20 +02:00
Niels Abspoel
c7f4b3a611
Revert "Fix ipset:type colon handling error" 2018-05-13 22:14:49 +02:00
Niels Abspoel
0a1f82dbf6
Merge pull request #16 from netmanagers/master
Fix ipset:type colon handling error
2018-05-13 21:58:24 +02:00
Javier Bértoli
2fc03fbd70 Fix ipset:type colon handling error 2018-05-10 07:53:54 -03:00
Niels Abspoel
b607a7abdd
Merge pull request #15 from Angelo-Verona/master
Default file permission for firewalld.conf
2017-12-28 11:08:57 +01:00
Angelo Verona
b1d6b52307 Default file permission for firewalld.conf is 644 not 640 (CentOS). Even if I think that "others" don't need to read that, it always shows up as file with non-default permissions from default rpm package in security scans. e.g. "rpm -Va |grep ^.M" or more salty way: "salt '*' pkg.verify" / salt '*' pkg.modified firewalld mode=True; manual fix e.g. rpm --setperms firewalld-*.el7.noarch 2017-12-28 02:45:05 +01:00
Niels Abspoel
28a15e1707
Merge pull request #14 from pauldalewilliams/add-ipset-as-source-in-zones
Add support for using ipsets as sources in a zone
2017-11-25 19:06:05 +01:00
Paul Williams
2fd70c9f41
Add support for using ipsets as sources in a zone
I wanted to be able to add an ipset as a source in the zone without using a rich rule.  I believe this change accomplishes that.  Tested and working on CentOS 7 (salt master and minion).
2017-11-24 18:31:17 -05:00
Niels Abspoel
be25aa2fa6 Merge pull request #12 from netmanagers/master
Add warning header to salt-generated files
2017-05-25 23:58:49 +02:00
Javier Bértoli
141d8a4781 Add warning header to salt-generated files 2017-05-25 18:51:04 -03:00
Javier Bértoli
462964c184 Merge pull request #11 from aboe76/suse_support
add suse_support
2017-05-25 17:48:18 -03:00
Niels Abspoel
5904c75875 add suse_support 2017-05-25 22:41:40 +02:00
Javier Bértoli
f5093495bc Merge pull request #10 from amendlik/service-reload
Reload service rather than restart
2017-03-13 07:10:42 -03:00
Adam Mendlik
103afc0a18 Reload, rather than restart, the FirewallD service 2017-03-11 12:51:12 -07:00
Adam Mendlik
112580daa1 Add basic test suite 2017-03-10 11:30:39 -07:00
Niels Abspoel
97fac49bfd Merge pull request #9 from Hoovism/master
Added comment option for zone sources.
2016-09-30 11:58:58 +02:00
Matthew Hoover
cc617a97ef Added comment option for zone sources. 2016-09-29 22:50:55 -04:00
Niels Abspoel
9d783b178a Merge pull request #8 from hoonetorg/firewalld04
firewalld 0.4 settings
2016-09-19 22:22:26 +02:00
hoonetorg
25cdfe3bbe firewalld 0.4 settings 2016-09-19 16:02:35 +02:00
Niels Abspoel
b78b3a3a2b Merge pull request #7 from hoonetorg/directrules
implement direct rules
2016-09-13 23:35:31 +02:00
hoonetorg
9dc0a77167 implement direct rules 2016-09-13 23:25:51 +02:00
Niels Abspoel
c17457629e Merge pull request #6 from hoonetorg/20163fix
fix data type in templates, which broke formula for 2016.3
2016-09-13 22:52:12 +02:00
hoonetorg
b91d65d135 fix data type in zone and service template, which broke formula for 2016.3 2016-09-13 21:40:00 +02:00
Wolodja Wentland
aeeb6fd38a Merge pull request #4 from aboe76/ipset_support
add ipset support for firewalld
2016-09-05 15:43:09 +02:00
Niels Abspoel
c5a01c837e add ipset support for firewalld 2016-09-03 21:43:40 +02:00
Niels Abspoel
68bebd6fbb Merge pull request #3 from cmercier/master
change the restart, it was not effective before
2016-03-16 20:14:12 +01:00
Clément Mercier
588bf5efcf change the restart, it was not effective before 2016-03-16 18:24:56 +01:00
Colton Myers
bbe8e33364 Merge pull request #1 from aboe76/improvements
improvements to formula with defaults.yaml
2016-01-29 17:50:13 -07:00
Niels Abspoel
5fc2f58b0c improvements to formula with defaults.yaml 2016-01-19 22:15:08 +01:00
David Bezuidenhout
d55b767b91 [remove] clean-up some code, mostly code commented out 2016-01-19 17:31:29 +02:00
David
d78e3510d6 Merge pull request #4 from aboe76/master
Minor improvements
2015-05-29 10:31:19 +02:00
Niels Abspoel
cea22ec1e1 Updated Readme,
Tested formula on 2015.5.0 Archlinux and found no issues
2015-05-25 15:31:57 +02:00
Niels Abspoel
e77a52cf27 fix newline to make service.xml files more readable 2015-05-25 15:30:52 +02:00
David Bezuidenhout
8afeae049f [fix] mising bracket at endfor loop at <destination ipv6 2015-03-11 16:38:54 +02:00
David Bezuidenhout
941b2768b1 [fix] service definition in rich rules - thx jdreese on Github 2015-03-11 16:17:29 +02:00
David Bezuidenhout
847417f03e [update] jinja brackets so that resulting output on xml files are better
human readable
2015-03-11 16:04:00 +02:00
David Bezuidenhout
b584c44edc [fix] source attribute key - github issue 1 2015-03-11 15:36:06 +02:00
David
0d285162d2 Merge pull request #3 from saxonww/master
fix header issue
2015-01-11 10:34:24 +02:00