Merge pull request #651 from jrnt30/hierarhcyFix

Modifying hierarchy of the Version/Params to fix AWS AMI
xbezdick · Feb 27, 2014 · b499aa2 · b499aa2
2 parents d28ce64 + 769ff36
commit b499aa2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -19,13 +19,6 @@
 # Sample Usage:
 #
 class apache::params inherits ::apache::version {
-  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
-  $osr_array = split($::operatingsystemrelease,'[\/\.]')
-  $distrelease = $osr_array[0]
-  if ! $distrelease {
-    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
-  }
-
   if($::fqdn) {
     $servername = $::fqdn
   } else {

diff --git a/manifests/version.pp b/manifests/version.pp
@@ -3,16 +3,23 @@
 # Try to automatically detect the version by OS
 #
 class apache::version {
+  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
+  $osr_array = split($::operatingsystemrelease,'[\/\.]')
+  $distrelease = $osr_array[0]
+  if ! $distrelease {
+    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
+  }
+
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18) or ($::operatingsystem != 'Fedora' and $::operatingsystemrelease >= 7) {
+      if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
         $default = 2.4
       } else {
         $default = 2.2
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
+      if $::operatingsystem == 'Ubuntu' and $distrelease >= 13.10 {
         $default = 2.4
       } else {
         $default = 2.2