From c4649cd122eb73c9dfb5498436abb636174d1180 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 23 Dec 2009 16:40:33 -0500
Subject: organize files in subdirectories per type : 'config' for main apache
 config; 'scripts' for extra shell scripts; 'service' for service default
 parameters. also, manage apache2.conf on Debian.

---
 manifests/openbsd.pp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'manifests/openbsd.pp')

diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp
index 606bdc6..d68688f 100644
--- a/manifests/openbsd.pp
+++ b/manifests/openbsd.pp
@@ -21,12 +21,12 @@ class apache::openbsd inherits apache::base {
         file => '/etc/rc.conf.local',
         line => 'httpd flags=""',
     }
-    file{"$config_dir/conf/httpd.conf":
-        source => [ "puppet://$server/modules/site-apache/conf/${fqdn}/httpd.conf",
-                    "puppet://$server/modules/site-apache/conf/${apache_cluster_node}/httpd.conf",
-                    "puppet://$server/modules/site-apache/conf/httpd.conf",
-                    "puppet://$server/modules/apache/conf/${operatingsystem}/httpd.conf",
-                    "puppet://$server/modules/apache/conf/httpd.conf" ],
+    file{'apache_main_config':
+        path => "${config_dir}/conf/httpd.conf",
+        source => [ "puppet://$server/modules/site-apache/config/OpenBSD/${fqdn}/httpd.conf",
+                    "puppet://$server/modules/site-apache/config/OpenBSD/${apache_cluster_node}/httpd.conf",
+                    "puppet://$server/modules/site-apache/config/OpenBSD//httpd.conf",
+                    "puppet://$server/modules/apache/config/OpenBSD/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/modules/apache/OpenBSD/bin/restart_apache.sh",
+        source => "puppet://$server/modules/apache/scripts/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/modules/apache/OpenBSD/bin/apache_logrotate.sh",
+        source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh",
         require => File['/opt/bin'],
         owner => root, group => 0, mode => 0700;
     }
-- 
cgit v1.2.3