From e0ed4e6b4693adf16a90e552022c9cb4c587ac58 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Wed, 29 Oct 2014 14:52:28 +0100 Subject: [PATCH] Update firewall to latest master commit f061452461c841e83f20df1f9dd0aea485fb9744 Merge: db96537 fd5ab55 Author: Morgan Haskel Date: Tue Oct 28 12:52:03 2014 -0400 Merge pull request #405 from cdenneen/master EL7 Fixes for CentOS commit fd5ab55c87b69b087c69968a0d0c25e3b783db52 Merge: 653bb02 ed5dd3e Author: cdenneen Date: Mon Oct 27 21:23:59 2014 -0400 Merge pull request #1 from cmurphy/fix_el7_tests Update tests for EL 7 commit ed5dd3e5d0870fe8fe2925c9e5215f18813e7791 Author: Colleen Murphy Date: Mon Oct 27 13:36:46 2014 -0700 Update tests for EL 7 Without this patch, unit tests make no distinction between EL < 7 and EL 7. This is a problem because the iptables save exec is different between the two operating systems, so the tests will fail for EL 7. This patch fixes the problem by updating the tests to include the new exec command for EL 7. commit db965375d3b362997051720a61c463597165182c Merge: 4ed1b43 1247c22 Author: Colleen Murphy Date: Fri Oct 24 14:23:24 2014 -0700 Merge pull request #424 from mhaskel/purge_ip6_fix Missing a provider specification commit 4ed1b43e1629c1b6108133b0fc3be603d03ffe6c Merge: dfb5e54 e7f9a38 Author: Hunter Haugen Date: Thu Oct 23 15:15:45 2014 -0700 Merge pull request #383 from vzctl/ipset add ipset support commit 1247c22c1096dcfcdcd8c0d2316eb6a1d88723cb Author: Morgan Haskel Date: Thu Oct 23 10:31:57 2014 -0600 Missing a provider specification commit dfb5e54481e31f5cac53e701b93d42fb066de9bf Merge: d2addf1 f7652f3 Author: Hunter Haugen Date: Wed Oct 22 10:44:38 2014 -0700 Merge pull request #423 from mhaskel/metadata_fix Invalid metadata commit f7652f321c560ca395e8db3a417a8abc051f38bb Author: Morgan Haskel Date: Wed Oct 22 10:43:27 2014 -0700 Invalid metadata commit d2addf16979d5b5a87edec9ab279752c938fb3ac Merge: f157da0 6cafec4 Author: Morgan Haskel Date: Mon Oct 20 14:01:29 2014 -0700 Merge pull request #422 from hunner/fix_instances (MODULES-41) Change source for ip6tables provider commit 6cafec4a5a90aef5c44c13697cd21274b1746563 Author: Hunter Haugen Date: Mon Oct 20 13:33:36 2014 -0700 (MODULES-41) Change source for ip6tables provider This will allow purging of ipv6 rules commit f157da01cc0419fd8422b92bed72b086ff6f16d9 Merge: 1417eef 8846341 Author: Hunter Haugen Date: Mon Oct 20 09:56:47 2014 -0700 Merge pull request #420 from mhaskel/metadata_update Update to support PE3.x commit 1417eef31988e5d7adda2897959d1ea270dcf789 Merge: 3658a85 5b5f923 Author: Hunter Haugen Date: Mon Oct 20 09:56:39 2014 -0700 Merge pull request #419 from mhaskel/future_parser Fix for future parser commit e7f9a38624b0dae630351a595c071b04dec34904 Author: Alexey Lapitsky Date: Fri Sep 19 15:39:22 2014 -0400 add more ipset documentation commit e55d4ecf7becf8853ba15f028317ee16ee9a39dd Author: Alexey Lapitsky Date: Fri Sep 19 15:19:49 2014 -0400 add negation support for ipset commit 52d82874e9c1f33da7c72b42dc4579e8f8ae22f3 Author: Patrick Hemmer Date: Sat Apr 26 12:13:59 2014 -0400 add ipset support commit 88463414402d58ab54be389e209ecbaf87a8fcee Author: Morgan Haskel Date: Sat Oct 18 17:22:03 2014 -0700 Update to support PE3.x commit 5b5f923df60e4fb89bdd292ba6c1d54b3905fa45 Author: Morgan Haskel Date: Sat Oct 18 17:08:41 2014 -0700 Fix for future parser I'm not entirely sure why this was having issues with the future parser, but there was something funny with the pp function. commit 3658a85057bfabdd541bba0f7a568aaef4f56530 Merge: 91570b4 df4ed1b Author: Hunter Haugen Date: Fri Oct 17 14:22:22 2014 -0700 Merge pull request #418 from mhaskel/remove_oel5 Doesn't actually support OEL5 commit df4ed1b07f9af3a3039a00217bc7136a955888ad Author: Morgan Haskel Date: Fri Oct 17 14:15:37 2014 -0700 Doesn't actually support OEL5 There are weird interactions between the version of iptables and the kernel on OEL5. commit 91570b42c1a18a8d0f99311a711fff9704a0fb76 Merge: de7d781 b65afaf Author: Morgan Haskel Date: Fri Oct 17 10:26:21 2014 -0700 Merge pull request #417 from jbondpdx/fix-readme DOCUMENT-75: cstate param in my_fw::pre example should be state commit b65afaf3f613f2ee23cb76560a88ad6a0bb457d3 Author: jbondpdx Date: Fri Oct 17 10:20:39 2014 -0700 DOCUMENT-75: cstate param in my_fw::pre example should be state Fixed! commit de7d78168c6c0ef798136ac60109b56be544b2d4 Merge: 903a3a0 244f3f6 Author: Hunter Haugen Date: Thu Oct 16 16:38:29 2014 -0700 Merge pull request #416 from mhaskel/selinux_fixes Don't do the idempotency checks with selinux commit 244f3f666d8a5c2f7f84793a4a8e8b8c2c03aacb Author: Morgan Haskel Date: Thu Oct 16 16:21:47 2014 -0700 Don't do the idempotency checks with selinux Eventually the types should use autobefore, but until then, just don't do the idempotency checks. commit 903a3a0b5fa244f946562855dcd348a57f364e6e Merge: 00f6b5d 302f5ae Author: Hunter Haugen Date: Tue Oct 14 11:56:42 2014 -0700 Merge pull request #414 from mhaskel/spec_helper_fix Use puppet() so the module install works better commit 302f5aecd8f356db15ea50fe5ea44c9912e93003 Author: Morgan Haskel Date: Tue Oct 14 11:53:23 2014 -0700 Use puppet() so the module install works better This was failing on SLES10 due to path issues. commit 00f6b5d2077f84febfd046ead3dd4a399f2f41b7 Merge: 2b38d12 3f297ae Author: Travis Fields Date: Mon Oct 13 20:02:26 2014 -0700 Merge pull request #413 from mhaskel/rhel5_fixes Fix for RHEL5 commit 3f297ae6f8c84f5988a9e322c6407a53033725d1 Author: Morgan Haskel Date: Mon Oct 13 16:54:01 2014 -0700 Fix for RHEL5 iptables-save output is in a different order for RHEL5 systems. Make the tests check that ordering. commit 2b38d12395fd2046181d05e8697829206409eddf Merge: 955024e 473fffe Author: Colleen Murphy Date: Thu Oct 9 16:16:56 2014 -0700 Merge pull request #412 from mhaskel/resource_cmd_spec_fix Fix for resource_cmd_spec commit 473fffe359a215330b9662911b1293e8010141ed Author: Morgan Haskel Date: Thu Oct 9 19:03:16 2014 -0400 Fix for resource_cmd_spec Was checking for empty stderr in a few places, and also setting an iptables rule that doesn't work on deb7 and ubuntu trusty. commit 955024ee846a251686f70505c4502ac406cfe4d4 Merge: e8dca83 b79c277 Author: Morgan Haskel Date: Mon Sep 29 14:18:51 2014 -0500 Merge pull request #410 from justinstoller/bug/master/FM-1923-fixup-hieraconf (FM-1923) Fix spec_helper_acceptance to run against PE commit b79c277d4d499c903974cfd0b7fd4f9f689b0cfc Author: Justin Stoller Date: Mon Sep 29 12:16:10 2014 -0700 (FM-1923) Fix spec_helper_acceptance to run against PE commit e8dca8344476d481d8898549566814c6c9950b1c Merge: 2df558c a626cf2 Author: Travis Fields Date: Wed Sep 17 09:05:24 2014 -0700 Merge pull request #407 from hunner/redirect_validate (MODULES-1086) toports is not reqired with jump == REDIRECT commit a626cf2dcf24d12ced4d91a15ab64b5494d4ffb2 Author: Hunter Haugen Date: Mon Sep 15 16:20:09 2014 -0700 (MODULES-1086) toports is not reqired with jump == REDIRECT From the man page for REDIRECT and --to-ports: "This specifies a destination port or range of ports to use: without this, the destination port is never altered." commit 2df558cc9dc78fde3e4aefc887f371f36faf1038 Merge: d5a10f5 1c7d88b Author: Hunter Haugen Date: Wed Sep 10 11:50:04 2014 -0700 Merge pull request #406 from cyberious/master Remove puppet_module_install in favor of copy_module_to commit 1c7d88bde874db7390bf82b4bf9e5b9ec4a5cd34 Author: Travis Fields Date: Wed Sep 10 11:47:53 2014 -0700 Remove puppet_module_install in favor of copy_module_to commit 653bb022b46a10ff7cccb280d1c14c1f3a9eb7c8 Author: cdenneen Date: Wed Sep 3 22:42:19 2014 -0400 Update redhat.pp commit af94f65d37fa9c0bc366c4f45640ea80b69c36d7 Author: cdenneen Date: Wed Sep 3 22:23:57 2014 -0400 Update firewall.rb commit 4563e2d4f3084ff1f6b901d2cbd77d46c9e4d55f Author: cdenneen Date: Wed Sep 3 13:14:06 2014 -0400 Centos 7 won't work with operatingsystemrelease 7.0 Centos 7 operatingsystemrelease is 7.0.1406 for example so switching to operatingsystemmajrelease would allow for 7 to be used for all EL7 products commit 0d40289a76726f44ff80219bbef421d8a6ffbcbd Author: cdenneen Date: Wed Sep 3 13:08:17 2014 -0400 Add CentOS to facter value operatingsystem test --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 11ec2f887..c87e1a63f 100644 --- a/Puppetfile +++ b/Puppetfile @@ -23,7 +23,7 @@ mod 'concat', :git => 'https://github.com/puppetlabs/puppetlabs-concat.git' mod 'firewall', - :commit => 'd5a10f5a52d84b9fcfb8fc65ef505685a07d5799', + :commit => 'f061452461c841e83f20df1f9dd0aea485fb9744', :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git' mod 'galera',