From 5983d4bcec778a6030b268eebe1e5fc83689dda7 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 4 Apr 2008 15:30:26 +0000
Subject: moved /dist/-stuff to /files/, heavily refactored a lot, made it more
 look all the same way. some sources added here and there. hope it still works
 everything, the location on the disk of /files/ is still call dists. no need
 to hurry to change that

---
 manifests/modules/mod_security.pp |  2 +-
 manifests/modules/php.pp          | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'manifests/modules')

diff --git a/manifests/modules/mod_security.pp b/manifests/modules/mod_security.pp
index 4cfc86f..bbc04c9 100644
--- a/manifests/modules/mod_security.pp
+++ b/manifests/modules/mod_security.pp
@@ -40,7 +40,7 @@ class apache::mod_security::base {
 
 #    file{custom_host_rules:
 #        path => "/etc/apache2/modules.d/mod_security/Zcustom_rules/",
-#        source => [ "puppet://$server/dist/apache/mod_security/custom_rules/${fqdn}",
+#        source => [ "puppet://$server/files/apache/mod_security/custom_rules/${fqdn}",
 #                    "puppet://$server/apache/mod_security/custom_rules.Default_keep_it_empty/" ],
 #        recurse => true,
 #        owner => root,
diff --git a/manifests/modules/php.pp b/manifests/modules/php.pp
index 149b678..9609a96 100644
--- a/manifests/modules/php.pp
+++ b/manifests/modules/php.pp
@@ -9,6 +9,19 @@ class php::base {
         before => Service[apache],
         notify => Service[apache],
     }
+    file{php_ini_config:
+        path => "/etc/php/apache2-php5/php.ini",
+        source => [
+	        "puppet://$server/files/apache/php/apache2_php5_php.ini/${fqdn}/php.ini",
+	        "puppet://$server/files/apache/php/apache2_php5_php.ini/php.ini",
+	        "puppet://$server/apache/php/apache2_php5_php.ini/php.ini"
+	    ],
+	    owner => root,
+	    group => 0,
+	    mode => 0644,
+	    require => [ Package[php], Package[apache] ],
+	    notify => Service[apache],
+    }
 }
 
 class php::centos inherits php::base {}
@@ -24,6 +37,10 @@ class php::debian::pear::common {
 }
 
 class php::debian inherits php::base {
+    #dunno yet about this config file under debian
+    File[php_ini_config]{
+        ensure => absent,
+    }
     Package[php]{
         name => 'php5',
     }
@@ -61,20 +78,6 @@ class php::gentoo inherits php::base {
     Package[php]{
         category => 'dev-lang',
     }
-   
-    # config files
-    file{"/etc/php/apache2-php5/php.ini":
-        source => [
-	        "puppet://$server/dist/apache/php/apache2_php5_php.ini/${fqdn}/php.ini",
-	        "puppet://$server/dist/apache/php/apache2_php5_php.ini/php.ini",
-	        "puppet://$server/apache/php/apache2_php5_php.ini/php.ini"
-	    ],
-	    owner => root,
-	    group => 0,
-	    mode => 0644,
-	    require => [ Package[php], Package[apache] ],
-	    notify => Service[apache],
-    }
 }
 
 
-- 
cgit v1.2.3