From 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 29 May 2012 22:50:03 +0200
Subject: rename site modules

---
 manifests/vhost/file.pp                  | 16 ++++++++--------
 manifests/vhost/file/documentrootfile.pp | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'manifests/vhost')

diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp
index 6c750c1..fdea1f9 100644
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -98,11 +98,11 @@ define apache::vhost::file(
         'absent': {
             $real_vhost_source = $vhost_source ? {
                 'absent'  => [
-                    "puppet:///modules/site-apache/vhosts.d/$fqdn/$name.conf",
-                    "puppet:///modules/site-apache/vhosts.d/$apache_cluster_node/$name.conf",
-                    "puppet:///modules/site-apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet:///modules/site-apache/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet:///modules/site-apache/vhosts.d/$name.conf",
+                    "puppet:///modules/site_apache/vhosts.d/$fqdn/$name.conf",
+                    "puppet:///modules/site_apache/vhosts.d/$apache_cluster_node/$name.conf",
+                    "puppet:///modules/site_apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet:///modules/site_apache/vhosts.d/$operatingsystem/$name.conf",
+                    "puppet:///modules/site_apache/vhosts.d/$name.conf",
                     "puppet:///modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
                     "puppet:///modules/apache/vhosts.d/$operatingsystem/$name.conf",
                     "puppet:///modules/apache/vhosts.d/$name.conf"
@@ -133,9 +133,9 @@ define apache::vhost::file(
             }
             if ($ensure!='absent') {
               File[$real_htpasswd_path]{
-                source => [ "puppet:///modules/site-apache/htpasswds/$fqdn/$name",
-                            "puppet:///modules/site-apache/htpasswds/$apache_cluster_node/$name",
-                            "puppet:///modules/site-apache/htpasswds/$name" ],
+                source => [ "puppet:///modules/site_apache/htpasswds/$fqdn/$name",
+                            "puppet:///modules/site_apache/htpasswds/$apache_cluster_node/$name",
+                            "puppet:///modules/site_apache/htpasswds/$name" ],
                 owner => root, group => 0, mode => 0644,
               }
             }
diff --git a/manifests/vhost/file/documentrootfile.pp b/manifests/vhost/file/documentrootfile.pp
index dd8e565..8645323 100644
--- a/manifests/vhost/file/documentrootfile.pp
+++ b/manifests/vhost/file/documentrootfile.pp
@@ -7,11 +7,11 @@ define apache::vhost::file::documentrootfile(
       $mode=440
 ){
     file{"$documentroot/$filename":
-        source  => [ "puppet:///modules/site-apache/vhost_varieties/$fqdn/$thedomain/$filename",
-                    "puppet:///modules/site-apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename",
-                    "puppet:///modules/site-apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
-                    "puppet:///modules/site-apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-                    "puppet:///modules/site-apache/vhost_varieties/$thedomain/$filename",
+        source  => [ "puppet:///modules/site_apache/vhost_varieties/$fqdn/$thedomain/$filename",
+                    "puppet:///modules/site_apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename",
+                    "puppet:///modules/site_apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
+                    "puppet:///modules/site_apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
+                    "puppet:///modules/site_apache/vhost_varieties/$thedomain/$filename",
                     "puppet:///modules/apache/vhost_varieties/$thedomain/$filename",
                     "puppet:///modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
                     "puppet:///modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-- 
cgit v1.2.3