From e83c5afdd92463969fafbb7abb28e5599a4c73de Mon Sep 17 00:00:00 2001
From: andreas <andreas@immerda.ch>
Date: Tue, 29 Apr 2008 12:23:55 +0000
Subject: test

---
 manifests/init.pp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 876c1d0..8425891 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -121,15 +121,11 @@ class apache::gentoo inherits apache::base {
     apache::module::file { '00_default_settings': }
     apache::module::file { '00_error_documents': }
     
-    # to set the default for the ServerName
-    file { '00_default_settings_ServerName.conf':
-        path => "$modules_dir/00_default_settings_ServerName.conf",
-        ensure => file,
-        owner => 'root',
-        group => 0,
-        mode => 644,
-        require => Package[apache],
+    # set the default for the ServerName
+    file{"${config_dir}/modules.d/00_default_settings_ServerName.conf":
         content => template('apache/modules_dir_00_default_settings_ServerName.conf.erb'),
+        require => Package[apache],
+        owner => root, group => 0, mode => 0644;
     }
 }
 
-- 
cgit v1.2.3