Added support for $apache_datadir variable.

apache/manifests/init.pp

@@ -3,14 +3,36 @@
 #
 class apache::common {
 
-    file { [ "/srv/www",
-             "/srv/www/log", ]:
+    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":
         ensure => installed,
     }