Updated the switch a little and reverted httpd back to apache2.

Phil Sturgeon · Phil Sturgeon · commit 2de452e65c01 · 2012-07-03T00:20:36.000+01:00
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,6 +1,6 @@
 class php::params {
-    case $operatingsystem {
-        /(Ubuntu|Debian)/: {
+    case $::operatingsystem {
+        'ubuntu', 'debian': {
             $base_dir = "/etc/php5/"
             $cli_dir = "${base_dir}cli/"
             $cli_ini = "${cli_dir}php.ini"
@@ -16,7 +16,7 @@
             $apache_dir = "${base_dir}apache2/"
             $apache_ini = "${apache_dir}php.ini"
             $apache_package_name = "libapache2-mod-php5"
-            $apache_service_name = "httpd"
+            $apache_service_name = "apache2"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`class php::params {`
`2`		`- case $operatingsystem {`
`3`		`- /(Ubuntu\|Debian)/: {`
	`2`	`+ case $::operatingsystem {`
	`3`	`+ 'ubuntu', 'debian': {`
`4`	`4`	`$base_dir = "/etc/php5/"`
`5`	`5`	`$cli_dir = "${base_dir}cli/"`
`6`	`6`	`$cli_ini = "${cli_dir}php.ini"`
`@@ -16,7 +16,7 @@`
`16`	`16`	`$apache_dir = "${base_dir}apache2/"`
`17`	`17`	`$apache_ini = "${apache_dir}php.ini"`
`18`	`18`	`$apache_package_name = "libapache2-mod-php5"`
`19`		`- $apache_service_name = "httpd"`
	`19`	`+ $apache_service_name = "apache2"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`