X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/31b50af0d7e9779f3b0bd3f67acfc9104512a39d..acef55cc1820116d689a0ecb8722453a4d353b8e:/configDefault/apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 7f6648a..10c4875 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -5,15 +5,19 @@ 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", {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG}),
+    ("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG}),
+    ("fritz", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val webNodes_default = ["mire"]
 
@@ -37,10 +41,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