summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-11-07 18:32:46 +0000
committermh <mh@immerda.ch>2008-11-07 18:32:46 +0000
commit90335c4c248e0bab6b3ff6664cd46e55228768f7 (patch)
treef63681435105ff53abaeab0a2a993c17e1ec8a25 /manifests/init.pp
parent31ed3154e51f2eb9c6200eac68231463c64720c9 (diff)
adjusted paths to general style
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp4
1 files changed, 2 insertions, 2 deletions
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",