hcoop: add testing server busted, allow admins to configure apache

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index b2c321e..7a7db7d 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -14,15 +14,14 @@ val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtoo
 
 val confDir = ConfigCore.localRoot ^ "/vhosts"
 
-val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG}),
-                   ("shelob",  {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_admin = [("mccarthy", {version = APACHE_2, auth = NO_AUTH}),
-                     ("minsky", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_all = [("shelob",  {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("minsky", {version = APACHE_2, auth = MOD_WAKLOG}),
+                      ("busted", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
-val proxyHosts = ["bog", "marsh"]
+val proxyHosts = ["marsh"]
 
 val public_html = "public_html"
 
@@ -76,9 +75,7 @@ fun fastCgiWrapperOf user =
                       "-wrapper-wrapper"]
 
 (* FIXME: hcoop reference *)
-val phpFastCgiWrapper = "/afs/hcoop.net/common/bin/php5-fcgi-wrapper"
-
-val defaultPhpVersion = 5
+fun phpFastCgiWrapper version = "/afs/hcoop.net/common/bin/php" ^ Int.toString version ^ "-fcgi-wrapper"
 
 val waklogUserFile = ConfigCore.localRoot ^ "/waklog.conf"