X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/de7fde3da2abb20767042276f24aae79c5925f95..35d714e36d9b26c2951e7d4ff10cf247042a3a8f:/configDefault/apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index bec5354..3d10c3a 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -1,14 +1,67 @@
 structure Apache :> APACHE_CONFIG = struct
 
-val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache"
+open ConfigTypes
 
-val confDir = "/var/domtool/vhosts"
+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 webNodes = ["deleuze"]
+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})]
+
+val webNodes_default = ["navajos"]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 		    "http://hcoop.net/pipermail"]
 
-val public_html = "home/public_html"
+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