Fix typo in config

[hcoop/domtool2.git] / configDefault / apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
dissimilarity index 64%
index 4ef970b..c88f92c 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -1,37 +1,66 @@
-structure Apache :> APACHE_CONFIG = struct
-
-open ConfigTypes
-
-val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache"
-val down = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache-down"
-val undown = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache-undown"
-
-val reload1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3"
-val down1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-down"
-val undown1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-undown"
-
-val confDir = "/var/domtool/vhosts"
-
-val webNodes_all = [("mire", {version = APACHE_1_3, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
-
-val webNodes_default = ["mire"]
-
-val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
-                   "http://hcoop.net/pipermail"]
-
-val public_html = "public_html"
-
-fun logDirOf user =
-    if size user < 2 then
-       "/bad_username"
-    else
-       String.concat ["/var/log/apache/user/",
-                      String.substring (user, 0, 1),
-                      "/",
-                      String.substring (user, 0, 2),
-                      "/",
-                      user,
-                      "/apache/log"]
-
-end
+structure Apache :> APACHE_CONFIG = struct
+
+open ConfigTypes
+
+val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache"
+val down = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache-down"
+val undown = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache-undown"
+val fixperms = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache-fixperms"
+
+val reload1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3"
+val down1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3-down"
+val undown1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3-undown"
+val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3-fixperms"
+
+val confDir = ConfigCore.localRoot ^ "/vhosts"
+
+val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG}),
+                     ("mccarthy", {version = APACHE_2, auth = NO_AUTH})]
+
+val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
+                   "http://hcoop.net/pipermail"]
+
+val proxyHosts = ["bog"]
+
+val public_html = "public_html"
+
+fun logDirOf version1 user =
+    if size user < 2 then
+       "/bad_username"
+    else
+       String.concat [if version1 then
+                          "/var/log/apache/user/"
+                      else
+                          "/var/log/apache2/user/",
+                      String.substring (user, 0, 1),
+                      "/",
+                      String.substring (user, 0, 2),
+                      "/",
+                      user,
+                      "/apache/log"]
+
+(* FIXME: hcoop.net reference *)
+fun realLogDirOf user =
+    if size user < 2 then
+       "/bad_username"
+    else
+       String.concat ["/afs/hcoop.net/user/",
+                      String.substring (user, 0, 1),
+                      "/",
+                      String.substring (user, 0, 2),
+                      "/",
+                      user,
+                      "/.logs/apache"]
+
+fun backupLogDirOf version1 =
+    if version1 then
+       ConfigCore.sharedRoot ^ "/backup/apache/"
+    else
+       ConfigCore.sharedRoot ^ "/backup/apache2/"
+
+val defaultPhpVersion = 5
+
+val waklogUserFile = ConfigCore.localRoot ^ "/waklog.conf"
+
+end