Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit 0742842

Browse files
committed
Merge pull request #148 from legal90/fix-apache2
Fix apache listen ports attribute
2 parents 7f937a4 + e308b20 commit 0742842

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
supports 'scientific'
2222
supports 'ubuntu'
2323

24-
depends 'apache2'
24+
depends 'apache2', '>= 3.2.0'
2525
depends 'ark'
2626
depends 'cron'
2727
depends 'database'

recipes/apache2.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['port'])
2-
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'])
1+
node.default['apache']['listen'] |= [
2+
"*:#{node['stash']['apache2']['port']}",
3+
"*:#{node['stash']['apache2']['ssl']['port']}"
4+
]
35

46
include_recipe 'apache2'
57
include_recipe 'apache2::mod_proxy'

0 commit comments

Comments
 (0)