Update default_mods.pp

This should cover the case that on a Amazon AWS Image that is based on RHEL6/CentOS6 but the Apache in version 2.4 should be used, to avoid to load the non existing systemd Apache module.
xbezdick · Sep 25, 2014 · ae374cc · ae374cc
1 parent c54405e
commit ae374cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon' and versioncmp($::operatingsystemrelease, '2014.09') <= 0  ) ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }