aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-04-04 13:59:19 +0000
committerNicolas Vigier <boklm@mageia.org>2011-04-04 13:59:19 +0000
commitfd08983d706353030e23c8ee67f28b0ba7ed2f8d (patch)
tree24d8a3280a60afd02d06e4b92cf72565bcadf122
parent4cdf8d2611959d98b40c26a46f6fbeeb09056b4a (diff)
downloadpuppet-fd08983d706353030e23c8ee67f28b0ba7ed2f8d.tar
puppet-fd08983d706353030e23c8ee67f28b0ba7ed2f8d.tar.gz
puppet-fd08983d706353030e23c8ee67f28b0ba7ed2f8d.tar.bz2
puppet-fd08983d706353030e23c8ee67f28b0ba7ed2f8d.tar.xz
puppet-fd08983d706353030e23c8ee67f28b0ba7ed2f8d.zip
add bcd web directory
-rw-r--r--manifests/nodes.pp1
-rw-r--r--modules/bcd/manifests/init.pp7
-rw-r--r--modules/bcd/templates/vhost_bcd.conf3
3 files changed, 11 insertions, 0 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 771876e2..2a57f951 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -196,6 +196,7 @@ node rabbit {
include common::default_mageia_server
timezone::timezone { "Europe/Paris": }
include bcd::base
+ include bcd::web
include draklive::base
include access_classes::iso_makers
include openssh::ssh_keys_from_ldap
diff --git a/modules/bcd/manifests/init.pp b/modules/bcd/manifests/init.pp
index 3861d9b0..d69a6aa2 100644
--- a/modules/bcd/manifests/init.pp
+++ b/modules/bcd/manifests/init.pp
@@ -29,4 +29,11 @@ class bcd {
}
}
+
+ class web inherits base {
+ apache::vhost_base { "bcd.$domain":
+ location => "$bcd_home/public_html",
+ content => template('bcd/vhost_bcd.conf'),
+ }
+ }
}
diff --git a/modules/bcd/templates/vhost_bcd.conf b/modules/bcd/templates/vhost_bcd.conf
new file mode 100644
index 00000000..ceedb418
--- /dev/null
+++ b/modules/bcd/templates/vhost_bcd.conf
@@ -0,0 +1,3 @@
+<Directory <%= bcd_home %>/public_html>
+ Options Indexes
+</Directory>