From dc3f04cfdaa45d5550e9265cb0888d1dee6e52aa Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@panoulu.net>
Date: Thu, 4 Mar 2010 13:21:12 +0200
Subject: [PATCH] Added support for $apache_datadir variable.

---
 apache/manifests/init.pp | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp
index 9f35bd6..f68cc45 100644
--- a/apache/manifests/init.pp
+++ b/apache/manifests/init.pp
@@ -3,12 +3,34 @@
 #
 class apache::common {
 
-    file { [ "/srv/www",
-             "/srv/www/log", ]:
-        ensure => directory,
-        mode   => 0755,
-        owner  => root,
-        group  => root,
+    if $apache_datadir {
+        file { "${apache_datadir}":
+            ensure => directory,
+            mode   => 0755,
+            owner  => root,
+            group  => root,
+        }
+
+        file { "/srv/www":
+            ensure  => link,
+            target  => "${apache_datadir}",
+            require => File["${apache_datadir}"],
+        }
+    } else {
+        file { "/srv/www":
+            ensure => directory,
+            mode   => 0755,
+            owner  => root,
+            group  => root,
+        }
+    }
+
+    file { "/srv/www/log":
+        ensure  => directory,
+        mode    => 0755,
+        owner   => root,
+        group   => root,
+        require => File["/srv/www"],
     }
 
     package { "httpd":