X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/95798203fe321c2f64d2e4abc64a64dcc3aa3e9e..4648ee8ad333857882bddff03099bf870d42e19a:/configDefault/apache.cfg?ds=sidebyside

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index a65b7d8..7cb48f5 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -14,15 +14,13 @@ 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})]
 
 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,7 +74,7 @@ fun fastCgiWrapperOf user =
 		       "-wrapper-wrapper"]
 
 (* FIXME: hcoop reference *)
-val phpFastCgiWrapper = "/afs/hcoop.net/common/bin/php5-fcgi-wrapper"
+fun phpFastCgiWrapper version = "/afs/hcoop.net/common/bin/php" ^ Int.toString version ^ "-fcgi-wrapper"
 
 val waklogUserFile = ConfigCore.localRoot ^ "/waklog.conf"