X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/1e66f76c50f54ee1804bb700e163fa3e3e4f0ac1..95798203fe321c2f64d2e4abc64a64dcc3aa3e9e:/configDefault/apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 56a3a98..a65b7d8 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -14,14 +14,15 @@ 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}),
-    		      ("mccarthy", {version = APACHE_2, auth = NO_AUTH})]]
+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 proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 		    "http://hcoop.net/pipermail"]
 
-val proxyHosts = ["bog"]
+val proxyHosts = ["bog", "marsh"]
 
 val public_html = "public_html"
 
@@ -59,7 +60,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 *)
+val phpFastCgiWrapper = "/afs/hcoop.net/common/bin/php5-fcgi-wrapper"
 
 val waklogUserFile = ConfigCore.localRoot ^ "/waklog.conf"