X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/0da1c677dd0a079c9e985af37688cc9e833fc196..563e77927eb5faaae4571bd2b0811de590368581:/configDefault/apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 4b625bb..6a5dd65 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -1,13 +1,21 @@
 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 fixperms = "/usr/bin/sudo /usr/local/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 fixperms1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-fixperms"
 
 val confDir = "/var/domtool/vhosts"
 
-val webNodes_all = ["mire"]
-val webNodes_admin = ["deleuze"]
+val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val webNodes_default = ["mire"]
 
@@ -16,4 +24,41 @@ val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 
 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"]
+
+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/"
+    else
+	"/afs/hcoop.net/common/etc/domtool/backup/apache2/"
+
+val defaultPhpVersion = 4
+
+val waklogUserFile = "/var/domtool/waklog.conf"
+
 end