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/debian.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'manifests/debian.pp')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index 54302ae..ab19a1e 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -18,6 +18,17 @@ class apache::debian inherits apache::package {
     File[default_apache_index] {
         path => '/var/www/index.html',
     }
+    file { 'apache_main_config':
+        path => "${config_dir}/apache2.conf",
+        source => [ "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf",
+                    "puppet://$server/modules/site-apache/config/Debian/{$fqdn}/apache2.conf",
+                    "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf",
+                    "puppet://$server/modules/site-apache/config/Debian/apache2.conf",
+                    "puppet://$server/modules/apache/config/Debian/apache2.conf" ],
+        require => Package['apache'],
+        notify => Service['apache'],
+        owner => root, group => 0, mode => 0644;
+    }
     file { 'default_debian_apache_vhost':
         path => '/etc/apache2/sites-enabled/000-default',
         ensure => absent,
-- 
cgit v1.2.3