summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-05-17 11:11:14 +0000
committermh <mh@immerda.ch>2008-05-17 11:11:14 +0000
commit3570a598a812a79a626db90c75bcadd45fc328cf (patch)
tree0d0f7aa29ad047b00ab8480162691d762bf1acc4
parent79406c94730a346d269e792751ddd7ca8b3a4da1 (diff)
added more to the readme, fixed permissions
-rw-r--r--README5
-rw-r--r--manifests/init.pp4
2 files changed, 6 insertions, 3 deletions
diff --git a/README b/README
index 120e06d..526ad3a 100644
--- a/README
+++ b/README
@@ -19,4 +19,7 @@ similar manner. a few additional directories have to be
created as well some configuration files have to be deployed
to fit this schema.
-Vhosts can be added
+vhosts can be added with the vhosts define:
+(currently only plain vhosts file are supported)
+
+apache::vhosts::file { '$domain' }
diff --git a/manifests/init.pp b/manifests/init.pp
index da2fb96..81ec9e9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -90,14 +90,14 @@ class apache::centos inherits apache::base{
file{"${config_dir}/conf.d/ZZZ_vhosts.conf":
source => "puppet://$server/apache/centos/vhosts.conf",
- owner => root, group => 0, mode => 0755;
+ owner => root, group => 0, mode => 0644;
}
file{"${config_dir}/conf.d/ssl.conf":
source => [ "puppet://$server/files/apache/centos/${fqdn}/ssl.conf",
"puppet://$server/files/apache/centos/ssl.conf",
"puppet://$server/apache/centos/ssl.conf"
],
- owner => root, group => 0, mode => 0755;
+ owner => root, group => 0, mode => 0644;
}
apache::vhost::file { '00_default_centos_vhost': }
}