X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/781c123c5d41c41784c66a9ca18b4a34a11731cf..47b18d2866e2d2a6533f23ab64c5c72a747065ff:/configDefault/apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 48d852a..7a7db7d 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -14,13 +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})]
-val webNodes_admin = [("deleuze", {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"]
+val proxyHosts = ["marsh"]
 
 val public_html = "public_html"
 
@@ -58,7 +59,23 @@ fun backupLogDirOf version1 =
     else
 	ConfigCore.sharedRoot ^ "/backup/apache2/"
 
-val defaultPhpVersion = 5
+fun fastCgiWrapperOf user =
+      if size user < 2 then
+	"/bad_username"
+    else
+	String.concat [ConfigCore.sharedRoot,
+		       "/httpd/fastcgi/",
+		       String.substring (user, 0, 1),
+		       "/",
+		       String.substring (user, 0, 2),
+		       "/",
+		       user,
+		       "/",
+		       user,
+		       "-wrapper-wrapper"]
+
+(* FIXME: hcoop reference *)
+fun phpFastCgiWrapper version = "/afs/hcoop.net/common/bin/php" ^ Int.toString version ^ "-fcgi-wrapper"
 
 val waklogUserFile = ConfigCore.localRoot ^ "/waklog.conf"