From e351463a71d62cb02aac8a6c330f15e42759582f Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 23 Mar 2008 14:06:38 +0000
Subject: added php to main file

---
 manifests/init.pp        | 12 ++++++++++++
 manifests/modules/php.pp | 10 ----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index c02b30e..2abdf3f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -190,3 +190,15 @@ define apache::config::file(
         notify => Service[apache],
     }
 }
+
+#php
+class apache::php inherits apache {
+    case $operatingsystem {
+        debian: { include php::debian }
+        centos: { include php::centos }
+        ubuntu: { include php::ubuntu }
+        gentoo: { include php::gentoo }
+        default: { include php::base }
+    }
+}
+
diff --git a/manifests/modules/php.pp b/manifests/modules/php.pp
index c1e5836..b892686 100644
--- a/manifests/modules/php.pp
+++ b/manifests/modules/php.pp
@@ -3,16 +3,6 @@
 # changed and improved by immerda prohect group admin(at)immerda.ch
 # See LICENSE for the full license granted to you.
 
-class apache::php inherits apache {
-    case $operatingsystem {
-        debian: { include php::debian }
-        centos: { include php::centos }
-        ubuntu: { include php::ubuntu }
-        gentoo: { include php::gentoo }
-        default: { include php::base }
-    }
-}
-
 class php::base {
     package{php:
         ensure => installed,
-- 
cgit v1.2.3