opendev
/
puppet-storyboard
Code Issues Proposed changes

Merge "Fixed version detection"

This commit is contained in:
Jenkins 2014-09-29 19:59:22 +00:00 committed by Gerrit Code Review
parent 64417796b8 8843f476ea
commit 8373ceb4bb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/application.pp
View File

@ -205,7 +205,7 @@ class storyboard::application (
}
# Check vhost permission set.
$new_vhost_perms = (versioncmp($::apache::apache_version, '2.4') >= 0)
$new_vhost_perms = (versioncmp($::storyboard::params::apache_version, '2.4') >= 0)
# Are we setting up TLS or non-TLS?
if defined(Class['storyboard::cert']) {

6
manifests/params.pp
View File

@ -25,7 +25,11 @@ class storyboard::params () {
case $::osfamily {
'Debian': {
# Do nothing, since all the defaults are debian-specific.
if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
$apache_version = '2.4'
} else {
$apache_version = '2.2'
}
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'storyboard' module only supports osfamily Debian.")