From 7d7d2a9230e6224ccf4e40f9848483362eed7f02 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Tue, 1 Feb 2011 12:44:53 +0000
Subject: allow to set public_html on a vhost

---
 modules/apache/manifests/init.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/apache/manifests')

diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index c3de7720..f070a828 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -105,7 +105,8 @@ class apache {
     define vhost_base($content = '',
                       $location = '/dev/null', 
                       $use_ssl = false,
-                      $vhost = false) {
+                      $vhost = false,
+                      $enable_public_html = false) {
         if ! $vhost {
             $real_vhost = $name
         } else {
@@ -120,6 +121,10 @@ class apache {
             }
         }
 
+        if $enable_public_html {
+            include apache::mod_public_html
+        }
+
         $filename = "$name.conf"
         file { "$filename":
             path => "/etc/httpd/conf/vhosts.d/$filename",
-- 
cgit v1.2.1