From 1b2310bab053cd40616e9740f9d38ef8826b3764 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 14 Nov 2009 14:34:05 +0100
Subject: update apache module to 0.25.x style

---
 manifests/centos/itk.pp    | 4 ++--
 manifests/centos/module.pp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'manifests/centos')

diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp
index f944a53..98939c2 100644
--- a/manifests/centos/itk.pp
+++ b/manifests/centos/itk.pp
@@ -5,8 +5,8 @@ class apache::centos::itk inherits apache::centos {
         name => 'httpd-itk',
     }
     File['/etc/sysconfig/httpd']{
-      source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd.itk",
-                  "puppet://$server/files/apache/sysconfig/httpd.itk",
+      source => [ "puppet://$server/modules/site-apache/sysconfig/${fqdn}/httpd.itk",
+                  "puppet://$server/modules/site-apache/sysconfig/httpd.itk",
                   "puppet://$server/modules/apache/sysconfig/${operatingsystem}/httpd.itk",
                   "puppet://$server/modules/apache/sysconfig/httpd.itk" ],
     }
diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp
index b5b0d08..4bbf251 100644
--- a/manifests/centos/module.pp
+++ b/manifests/centos/module.pp
@@ -3,16 +3,16 @@ define apache::centos::module(
     $source = '',
     $destination = ''
 ){
-    $modules_dir = "$apache::centos::config_dir/modules.d/"
+    $modules_dir = "$apache::centos::config_dir/modules.d"
     $real_destination = $destination ? {
         '' => "${modules_dir}/${name}.so",
         default => $destination,
     }
     $real_source = $source ? {
         ''  => [
-            "puppet://$server/files/apache/modules.d/${fqdn}/${name}.so",
-            "puppet://$server/files/apache/modules.d/${apache_cluster_node}/${name}.so",
-            "puppet://$server/files/apache/modules.d/${name}.so",
+            "puppet://$server/modules/site-apache/modules.d/${fqdn}/${name}.so",
+            "puppet://$server/modules/site-apache/modules.d/${apache_cluster_node}/${name}.so",
+            "puppet://$server/modules/site-apache/modules.d/${name}.so",
             "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.so",
             "puppet://$server/modules/apache/modules.d/${name}.so"
         ],
-- 
cgit v1.2.3