Merge pull request #2193 from ekohl/main

sheenaajay · web-flow · commit e4a1532b26e5 · 2021-09-13T12:58:51.000+01:00
Restore Ubuntu 14.04 support in suphp
diff --git a/manifests/mod/suphp.pp b/manifests/mod/suphp.pp
@@ -6,7 +6,7 @@
 class apache::mod::suphp (
 ) {
   if  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or
-  $facts['os']['family'] == 'Debian' {
+  $facts['os']['name'] == 'Debian' {
     fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")
   }
   include apache

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`class apache::mod::suphp (`
`7`	`7`	`) {`
`8`	`8`	`if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.10') >= 0) or`
`9`		`- $facts['os']['family'] == 'Debian' {`
	`9`	`+ $facts['os']['name'] == 'Debian' {`
`10`	`10`	`fail("suphp was declared EOL by it's creators as of 2013 and so is no longer supported on Ubuntu 15.10/Debian 8 and above. Please use php-fpm")`
`11`	`11`	`}`
`12`	`12`	`include apache`