Generation of slash-tilde waklog directives for each user

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index d7f90c3..6a5dd65 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -5,10 +5,12 @@ 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"
 
@@ -37,4 +39,26 @@ fun logDirOf version1 user =
                       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