domtool-adduser: use domtool-config to find ca

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 7f6648a..3d10c3a 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -2,24 +2,28 @@ 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 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 = "/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 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 = "/var/domtool/vhosts"
+val confDir = ConfigCore.localRoot ^ "/vhosts"
 
-val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
 val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
 
-val webNodes_default = ["mire"]
+val webNodes_default = ["navajos"]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
+val proxyHosts = ["bog"]
+
 val public_html = "public_html"
 
 fun logDirOf version1 user =
@@ -37,10 +41,27 @@ fun logDirOf version1 user =
                       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
-       "/afs/hcoop.net/common/etc/domtool/backup/apache/"
+       ConfigCore.sharedRoot ^ "/backup/apache/"
     else
-       "/afs/hcoop.net/common/etc/domtool/backup/apache2/"
+       ConfigCore.sharedRoot ^ "/backup/apache2/"
+
+val defaultPhpVersion = 5
+
+val waklogUserFile = ConfigCore.localRoot ^ "/waklog.conf"
 
 end