apache http proxy fix

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 This file is used to list changes made in each version of the bamboo cookbook.
 
+## v2.0.2 (December 20, 2016)
+
+Fixes:
+- Pin apache 3.2.1 due to issue 422 in 3.2.2
+
 ## v2.0.1 (December 20, 2016)
 
 Fixes:

metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email 'ramonmakkelie@gmail.com, soudmaijer@gmail.com'
 license          'Apache 2.0'
 description      'Installs and configures Bamboo'
-version          '2.0.1'
+version          '2.0.2'
 issues_url       'https://github.com/afklm/bamboo/issues' if respond_to?(:issues_url)
 source_url       'https://github.com/afklm/bamboo.git' if respond_to?(:source_url)
 
@@ -23,7 +23,7 @@
 # Always specify the version of your dependencies
 depends 'apt'
 depends 'ark'
-depends 'apache2'
+depends 'apache2', '= 3.2.1'
 depends 'cron'
 depends 'patch'
 depends 'backup', '= 0.3.0'

recipes/apache2.rb

@@ -16,18 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-if node['apache'].attribute?('listen_ports')
-  # Compatibility with cookbook 'apache' < 3.2.0
-  node.default['apache']['listen_ports'] |= [
-    node['bamboo']['apache2']['port'],
-    node['bamboo']['apache2']['ssl']['port']
-  ]
-else
-  node.default['apache']['listen'] |= [
-    "*:#{node['bamboo']['apache2']['port']}",
-    "*:#{node['bamboo']['apache2']['ssl']['port']}"
-  ]
-end
+node.default['apache']['listen'] += ["*:#{node['bamboo']['apache2']['port']}"]
+node.default['apache']['listen'] += ["*:#{node['bamboo']['apache2']['ssl']['port']}"]
 
 include_recipe 'apache2'
 include_recipe 'apache2::mod_proxy'