Enable fritz as an admin web node
[hcoop/domtool2.git] / configDefault / apache.cfg
index 4ef970b..85268d7 100644 (file)
@@ -5,15 +5,18 @@ 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_1_3, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
+val webNodes_all = [("mire", {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"]
 
@@ -22,11 +25,14 @@ val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 
 val public_html = "public_html"
 
-fun logDirOf user =
+fun logDirOf version1 user =
     if size user < 2 then
        "/bad_username"
     else
-       String.concat ["/var/log/apache/user/",
+       String.concat [if version1 then
+                          "/var/log/apache/user/"
+                      else
+                          "/var/log/apache2/user/",
                       String.substring (user, 0, 1),
                       "/",
                       String.substring (user, 0, 2),
@@ -34,4 +40,26 @@ fun logDirOf 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