Merge pull request #865 from p7s1-wschreiner/patch-1

Morgan Haskel · Morgan Haskel · commit 91007b1d87ae · 2014-09-29T10:34:51.000-05:00
Update default_mods.pp
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': }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`if versioncmp($apache_version, '2.4') >= 0 {`
`13`	`13`	`# Lets fork it`
`14`	`14`	`# Do not try to load mod_systemd on RHEL/CentOS 6 SCL.`
`15`		`- if !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) {`
	`15`	`+ if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon' and versioncmp($::operatingsystemrelease, '2014.09') <= 0 ) ) {`
`16`	`16`	`::apache::mod { 'systemd': }`
`17`	`17`	`}`
`18`	`18`	`::apache::mod { 'unixd': }`