Enable fritz as an admin web node

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 7f6648a..85268d7 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -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 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 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 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_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG}),
+    ("fritz", {version = APACHE_2, auth = MOD_WAKLOG})]

 
 val webNodes_default = ["mire"]
 
 
 val webNodes_default = ["mire"]
 


@@ -37,10 +40,26 @@ fun logDirOf version1 user =
                       user,
                       "/apache/log"]
 
                       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/"
 
 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
 end