apache: remove php5-cgi support, always generate php config

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 7e6f609..a65b7d8 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -1,14 +1,83 @@
 structure Apache :> APACHE_CONFIG = struct
 
-val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache"
+open ConfigTypes
 
-val confDir = "/var/domtool/vhosts"
+val reload = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache"
+val down = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache-down"
+val undown = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache-undown"
+val fixperms = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache-fixperms"
 
-val webNodes = ["deleuze"]
+val reload1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3"
+val down1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3-down"
+val undown1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3-undown"
+val fixperms1 = ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "/sbin/domtool-publish apache1.3-fixperms"
+
+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 proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
-val logDir = "/var/log/apache2"
+val proxyHosts = ["bog", "marsh"]
+
+val public_html = "public_html"
+
+fun logDirOf version1 user =
+    if size user < 2 then
+       "/bad_username"
+    else
+       String.concat [if version1 then
+                          "/var/log/apache/user/"
+                      else
+                          "/var/log/apache2/user/",
+                      String.substring (user, 0, 1),
+                      "/",
+                      String.substring (user, 0, 2),
+                      "/",
+                      user,
+                      "/apache/log"]
+
+(* FIXME: hcoop.net reference *)
+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
+       ConfigCore.sharedRoot ^ "/backup/apache/"
+    else
+       ConfigCore.sharedRoot ^ "/backup/apache2/"
+
+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"
 
 end