Merge pull request #163 from chef-cookbooks/release

Release v2.6.0 with Chef 13 support

CHANGELOG.md

@@ -2,6 +2,13 @@ firewall Cookbook CHANGELOG
 =======================
 This file is used to list changes made in each version of the firewall cookbook.
 
+v2.6.0 (2017-04-17)
+-------------------
+* Initial Chef 13.x support (#160, #159)
+* Allow loopback and icmp, when enabled (#161)
+* Address various newer rubocop and foodcritic complaints
+* Convert rule provider away from DSL (#159)
+
 v2.5.4 (2017-02-13)
 -------------------
 * Update Test Kitchen platforms to the latest

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache-2.0'
 description 'Provides a set of primitives for managing firewalls and associated rules.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '2.5.4'
+version '2.6.0'
 
 supports 'amazon'
 supports 'centos'
@@ -20,4 +20,4 @@
 
 source_url 'https://github.com/chef-cookbooks/firewall'
 issues_url 'https://github.com/chef-cookbooks/firewall/issues'
-chef_version '>= 13' if respond_to?(:chef_version)
+chef_version '>= 12.5' if respond_to?(:chef_version)

recipes/default.rb

@@ -39,7 +39,7 @@
   command :allow
   # debian ufw doesn't allow 'icmp' protocol, but does open
   # icmp by default, so we skip it in default recipe
-  only_if { linux? && !debian? && node['firewall']['allow_icmp'] }
+  only_if { (!debian? || iptables_firewall) && node['firewall']['allow_icmp'] }
 end
 
 firewall_rule 'allow world to ssh' do

test/integration/default/serverspec/windows_spec.rb

@@ -26,5 +26,5 @@
 end
 
 describe command('netsh advfirewall show currentprofile firewallpolicy | findstr "Firewall Policy"'), if: windows? do
-  its(:stdout) { should match('BlockInbound,BlockOutbound') }
+  its(:stdout) { should match('BlockInbound,AllowOutbound') }
 end