Commit Graph

218 Commits

Author SHA1 Message Date
Imran Iqbal
46288d6b50
Merge pull request #28 from aboe76/update_test_images
update test images
2019-04-30 20:07:25 +01:00
Niels Abspoel
f560dcd1b4 add @myii recommendations 2019-04-30 20:55:32 +02:00
Niels Abspoel
d201f448c9 update test images 2019-04-30 19:26:04 +02:00
Imran Iqbal
6a546ca192
Merge pull request #27 from aboe76/improve_service
update service and zones with more options
2019-04-06 22:39:30 +01:00
Niels Abspoel
a438f30f50 fix spacing in closing tags 2019-04-06 23:26:48 +02:00
Niels Abspoel
9522826dcb update gems 2019-04-06 22:03:15 +02:00
Niels Abspoel
87ecf4eea4 update gems 2019-04-06 21:58:48 +02:00
Niels Abspoel
18fc482853 update service and zones with more options
update kitchen travis
fix ipsets.sls
2019-04-06 21:40:50 +02:00
Javier Bértoli
f5c2acbd3a
Merge pull request #25 from aboe76/fix_travis
update kitchen.yml and Gemfile
2018-12-23 19:55:19 -03:00
Niels Abspoel
b05886c13e update kitchen.yml and Gemfile 2018-12-22 19:38:27 +01:00
Niels Abspoel
22e301a218
Merge pull request #24 from valibud/master
Add support for inet6 ipsets.
2018-12-10 20:01:04 +01:00
Valentin Bud
d1d7a9186c Add support for inet6 ipsets. 2018-12-10 13:44:53 +02:00
Niels Abspoel
a2d99c5957
Merge pull request #23 from netmanagers/master
Refactor ipset & backend
2018-08-26 07:55:00 +02:00
Javier Bértoli
951050008d Update pillar.example 2018-08-25 19:05:21 -03:00
Javier Bértoli
15a48462f0 Refactor backend format, add backward compatibility, simple pkg testing
See https://github.com/saltstack-formulas/firewalld-formula/pull/21#pullrequestreview-146958098
2018-08-25 19:00:11 -03:00
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
Niels Abspoel
9017ad5ea2
Merge pull request #22 from netmanagers/master
Update testing environment
2018-08-25 21:36:47 +02: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