From 90335c4c248e0bab6b3ff6664cd46e55228768f7 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 7 Nov 2008 18:32:46 +0000 Subject: adjusted paths to general style --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index b66be3d..17a63cc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -167,7 +167,7 @@ class apache::ubuntu inherits apache::debian {} ### openbsd class apache::openbsd inherits apache::base { - $config_dir = '/var/www/conf/' + $config_dir = '/var/www/' File[vhosts_dir]{ path => "$config_dir/vhosts.d/", @@ -184,7 +184,7 @@ class apache::openbsd inherits apache::base { line => 'httpd flags=""', } - file{"/var/www/conf/httpd.conf": + file{"$config_dir/conf/httpd.conf": 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", -- cgit v1.2.3