Merge pull request #61 from redBorder/development

Release 3.3.0

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-rb-proxy CHANGELOG
 ===============
 
+## 3.3.0
+
+  - nilsver
+    - [5ffe6d7] add firewall cookbook
+
 ## 3.2.1
 
   - JuanSheba

resources/attributes/default.rb

@@ -40,6 +40,7 @@
 default['redborder']['services'] = {}
 default['redborder']['services']['chef-client'] = true
 default['redborder']['services']['chrony'] = true
+default['redborder']['services']['firewall'] = true
 default['redborder']['services']['f2k'] = true
 default['redborder']['services']['k2http'] = true
 default['redborder']['services']['kafka'] = true
@@ -58,6 +59,7 @@
 
 default['redborder']['systemdservices']['chef-client'] = ['chef-client']
 default['redborder']['systemdservices']['chrony'] = ['chronyd']
+default['redborder']['systemdservices']['firewall'] = ['firewalld']
 default['redborder']['systemdservices']['f2k'] = ['f2k']
 default['redborder']['systemdservices']['k2http'] = ['k2http']
 default['redborder']['systemdservices']['kafka'] = ['kafka']

resources/metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder proxy'
-version          '3.2.1'
+version          '3.3.0'
 
 depends 'rb-common'
 depends 'rb-selinux'
@@ -26,3 +26,4 @@
 depends 'rbcgroup'
 depends 'rb-clamav'
 depends 'rb-chrony'
+depends 'rb-firewall'

resources/recipes/configure.rb

@@ -26,6 +26,14 @@
   end
 end
 
+rb_firewall_config 'Configure Firewall' do
+  if proxy_services['firewall']
+    action :add
+  else
+    action :remove
+  end
+end
+
 zookeeper_config 'Configure Zookeeper' do
   port node['zookeeper']['port']
   memory node['redborder']['memory_services']['zookeeper']['memory']