Add begin..rescue so we can remove apache pinning

bflad · Apr 24, 2016 · f5d2f00 · f5d2f00
1 parent 0742842
commit f5d2f00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/metadata.rb b/metadata.rb
@@ -21,7 +21,7 @@
 supports 'scientific'
 supports 'ubuntu'
 
-depends 'apache2', '>= 3.2.0'
+depends 'apache2'
 depends 'ark'
 depends 'cron'
 depends 'database'

diff --git a/recipes/apache2.rb b/recipes/apache2.rb
@@ -1,7 +1,12 @@
-node.default['apache']['listen'] |= [
-  "*:#{node['stash']['apache2']['port']}",
-  "*:#{node['stash']['apache2']['ssl']['port']}"
-]
+begin
+  node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['port'])
+  node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['ssl']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['ssl']['port'])
+rescue NoMethodError
+  node.default['apache']['listen'] |= [
+    "*:#{node['stash']['apache2']['port']}",
+    "*:#{node['stash']['apache2']['ssl']['port']}"
+  ]
+end
 
 include_recipe 'apache2'
 include_recipe 'apache2::mod_proxy'