Correct locations of public_html

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index bd5bc11..bec5354 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -9,4 +9,6 @@ val webNodes = ["deleuze"]
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
+val public_html = "home/public_html"
+
 end

diff --git a/configDefault/apache.csg b/configDefault/apache.csg
index dcf989c..89e3710 100644 (file)
--- a/configDefault/apache.csg
+++ b/configDefault/apache.csg
@@ -8,4 +8,6 @@ signature APACHE_CONFIG = sig
 
     val proxyTargets : string list
 
+    val        public_html : string
+
 end

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 78ea612..6c04738 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -79,7 +79,7 @@ val _ = Defaults.registerDefault ("Group",
 
 val _ = Defaults.registerDefault ("DocumentRoot",
                                  (TBase "your_path", dl),
-                                 (fn () => (EString (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/public_html"), dl)))
+                                 (fn () => (EString (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/" ^ Config.Apache.public_html), dl)))
 
 val _ = Defaults.registerDefault ("ServerAdmin",
                                  (TBase "email", dl),