Merge pull request #148 from legal90/fix-apache2

Fix apache listen ports attribute
bflad · Apr 23, 2016 · 0742842 · 0742842
2 parents 7f937a4 + e308b20
commit 0742842
Show file tree

Hide file tree

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

diff --git a/recipes/apache2.rb b/recipes/apache2.rb
@@ -1,5 +1,7 @@
-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'])
+node.default['apache']['listen'] |= [
+  "*:#{node['stash']['apache2']['port']}",
+  "*:#{node['stash']['apache2']['ssl']['port']}"
+]
 
 include_recipe 'apache2'
 include_recipe 'apache2::mod_proxy'