diff --git a/manifests/application.pp b/manifests/application.pp index 15d0bdd..325871a 100644 --- a/manifests/application.pp +++ b/manifests/application.pp @@ -197,7 +197,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']) { diff --git a/manifests/params.pp b/manifests/params.pp index 996548e..12fd0c8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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.")