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

Support multiple apache2 versions#150

Merged
linc01n merged 1 commit intobflad:masterfrom
linc01n:support-apache2-listen-ports-changes
Apr 25, 2016
Merged

Support multiple apache2 versions#150
linc01n merged 1 commit intobflad:masterfrom
linc01n:support-apache2-listen-ports-changes

Conversation

@linc01n
Copy link
Copy Markdown
Collaborator

@linc01n linc01n commented Apr 24, 2016

Remove apache2 pinning and wrap it inside a begin...rescue block

Related to #148

/cc @bflad @legal90

@legal90
Copy link
Copy Markdown
Contributor

legal90 commented Apr 24, 2016

LGTM 👍

@linc01n linc01n merged commit 8c03a9d into bflad:master Apr 25, 2016
@legal90
Copy link
Copy Markdown
Contributor

legal90 commented May 5, 2016

@linc01n To be honest, this statement looks a bit clearer, IMO:

if node['apache'].attribute?('listen_ports')
  # Compatibility with cookbook 'apache' < 3.2.0
  node.default['apache']['listen_ports'] |= [
    node['confluence']['apache2']['port'],
    node['confluence']['apache2']['ssl']['port']
  ]
else
  node.default['apache']['listen'] |= [
    "*:#{node['stash']['apache2']['port']}",
    "*:#{node['stash']['apache2']['ssl']['port']}"
  ]
end

@linc01n
Copy link
Copy Markdown
Collaborator Author

linc01n commented May 6, 2016

I think we should put this part in attributes/default.rb
That's the place we usually handle different versioning stuff.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants