recursivly updating file path to new 0.25 style

9 files changed, 24 insertions, 24 deletions

diff --git a/manifests/centos.pp b/manifests/centos.pp
index 64af2d2..4755af8 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -28,8 +28,8 @@ class apache::centos inherits apache::package {
     file{'/etc/sysconfig/httpd':
       source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd",
                   "puppet://$server/files/apache/sysconfig/httpd",
-                  "puppet://$server/apache/sysconfig/${operatingsystem}/httpd",
-                  "puppet://$server/apache/sysconfig/httpd" ],
+                  "puppet://$server/modules/apache/sysconfig/${operatingsystem}/httpd",
+                  "puppet://$server/modules/apache/sysconfig/httpd" ],
       require => Package['apache'],
       notify => Service['apache'],
       owner => root, group => 0, mode => 0644;
diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp
index 8b55110..f944a53 100644
--- a/manifests/centos/itk.pp
+++ b/manifests/centos/itk.pp
@@ -7,7 +7,7 @@ class apache::centos::itk inherits apache::centos {
     File['/etc/sysconfig/httpd']{
       source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd.itk",
                   "puppet://$server/files/apache/sysconfig/httpd.itk",
-                  "puppet://$server/apache/sysconfig/${operatingsystem}/httpd.itk",
-                  "puppet://$server/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 ebd6edc..b5b0d08 100644
--- a/manifests/centos/module.pp
+++ b/manifests/centos/module.pp
@@ -13,8 +13,8 @@ define apache::centos::module(
             "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/apache/modules.d/${operatingsystem}/${name}.so",
-            "puppet://$server/apache/modules.d/${name}.so"
+            "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.so",
+            "puppet://$server/modules/apache/modules.d/${name}.so"
         ],
         default => "puppet://$server/$source",
     }
diff --git a/manifests/config/file.pp b/manifests/config/file.pp
index 0fb18f5..d14cd36 100644
--- a/manifests/config/file.pp
+++ b/manifests/config/file.pp
@@ -31,9 +31,9 @@ define apache::config::file(
                     "puppet://$server/files/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}",
                     "puppet://$server/files/apache/conf.d/${operatingsystem}/${name}",
                     "puppet://$server/files/apache/conf.d/${name}",
-                    "puppet://$server/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}",
-                    "puppet://$server/apache/conf.d/${operatingsystem}/${name}",
-                    "puppet://$server/apache/conf.d/${name}"
+                    "puppet://$server/modules/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}",
+                    "puppet://$server/modules/apache/conf.d/${operatingsystem}/${name}",
+                    "puppet://$server/modules/apache/conf.d/${name}"
                 ],
                 default => "puppet://$server/$source",
             }
diff --git a/manifests/gentoo/module.pp b/manifests/gentoo/module.pp
index 262a25c..ce9656a 100644
--- a/manifests/gentoo/module.pp
+++ b/manifests/gentoo/module.pp
@@ -13,8 +13,8 @@ define apache::gentoo::module(
             "puppet://$server/files/apache/modules.d/${fqdn}/${name}.conf",
             "puppet://$server/files/apache/modules.d/${apache_cluster_node}/${name}.conf",
             "puppet://$server/files/apache/modules.d/${name}.conf",
-            "puppet://$server/apache/modules.d/${operatingsystem}/${name}.conf",
-            "puppet://$server/apache/modules.d/${name}.conf"
+            "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.conf",
+            "puppet://$server/modules/apache/modules.d/${name}.conf"
         ],
         default => "puppet://$server/$source",
     }
diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp
index 187224a..005090d 100644
--- a/manifests/openbsd.pp
+++ b/manifests/openbsd.pp
@@ -25,8 +25,8 @@ class apache::openbsd inherits apache::base {
         source => [ "puppet://$server/files/apache/conf/${fqdn}/httpd.conf",
                     "puppet://$server/files/apache/conf/${apache_cluster_node}/httpd.conf",
                     "puppet://$server/files/apache/conf/httpd.conf",
-                    "puppet://$server/apache/conf/${operatingsystem}/httpd.conf",
-                    "puppet://$server/apache/conf/httpd.conf" ],
+                    "puppet://$server/modules/apache/conf/${operatingsystem}/httpd.conf",
+                    "puppet://$server/modules/apache/conf/httpd.conf" ],
         notify => Service['apache'],
         owner => root, group => 0, mode => 0644;
     }
@@ -34,7 +34,7 @@ class apache::openbsd inherits apache::base {
         path => '/var/www/htdocs/default/www/index.html',
     }
     file{'/opt/bin/restart_apache.sh':
-        source => "puppet://$server/apache/OpenBSD/bin/restart_apache.sh",
+        source => "puppet://$server/modules/apache/OpenBSD/bin/restart_apache.sh",
         require => File['/opt/bin'],
         owner => root, group => 0, mode => 0700;
     }
@@ -48,7 +48,7 @@ class apache::openbsd inherits apache::base {
         stop => 'apachectl stop',
     }
     file{'/opt/bin/apache_logrotate.sh':
-        source => "puppet://$server/apache/OpenBSD/bin/apache_logrotate.sh",
+        source => "puppet://$server/modules/apache/OpenBSD/bin/apache_logrotate.sh",
         require => File['/opt/bin'],
         owner => root, group => 0, mode => 0700;
     }
diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp
index 04dadeb..edf6829 100644
--- a/manifests/ssl/openbsd.pp
+++ b/manifests/ssl/openbsd.pp
@@ -10,7 +10,7 @@ class apache::ssl::openbsd inherits apache::openbsd {
     }
 
     File['/opt/bin/restart_apache.sh']{
-        source => "puppet://$server/apache/OpenBSD/bin/restart_apache_ssl.sh",
+        source => "puppet://$server/modules/apache/OpenBSD/bin/restart_apache_ssl.sh",
     }
     Service['apache']{
         start => 'apachectl startssl',
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp
index bacdca5..cdc0599 100644
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -51,10 +51,10 @@ define apache::vhost::file(
                     "puppet://$server/files/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
                     "puppet://$server/files/apache/vhosts.d/$operatingsystem/$name.conf",
                     "puppet://$server/files/apache/vhosts.d/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$name.conf"
+                    "puppet://$server/modules/apache/vhosts.d/$name.conf",
+                    "puppet://$server/modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
+                    "puppet://$server/modules/apache/vhosts.d/$operatingsystem/$name.conf",
+                    "puppet://$server/modules/apache/vhosts.d/$name.conf"
                 ],
                 default => "puppet://$server/$vhost_source",
             }
diff --git a/manifests/vhost/file/documentrootfile.pp b/manifests/vhost/file/documentrootfile.pp
index c9daf9c..89ca4ac 100644
--- a/manifests/vhost/file/documentrootfile.pp
+++ b/manifests/vhost/file/documentrootfile.pp
@@ -12,10 +12,10 @@ define apache::vhost::file::documentrootfile(
                     "puppet://$server/files/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
                     "puppet://$server/files/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
                     "puppet://$server/files/apache/vhost_varieties/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$thedomain/$filename"
+                    "puppet://$server/modules/apache/vhost_varieties/$thedomain/$filename",
+                    "puppet://$server/modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
+                    "puppet://$server/modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
+                    "puppet://$server/modules/apache/vhost_varieties/$thedomain/$filename"
                    ],
         ensure  => file,
         require => Apache::Vhost::Webdir["$thedomain"],