X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/3fbbc260d9d2735b48636ff7a48d9edebbe6a73e..417edb970ec87cd1e45ea2923fdee4c6cb5d57f4:/lib/web_apps.dtl

diff --git a/lib/web_apps.dtl b/lib/web_apps.dtl
index 76ef7ac..e73e1ac 100644
--- a/lib/web_apps.dtl
+++ b/lib/web_apps.dtl
@@ -2,7 +2,6 @@
 
 val addWordPress = \ loc : (location) ->
   location loc with
-    phpVersion php5;
     rewriteRule "^(.*/)?\.svn/" "-" [forbidden, last];
     rewriteRule "^(.*/)?\.git/" "-" [forbidden, last];
 
@@ -14,15 +13,16 @@ val addWordPress = \ loc : (location) ->
 {{Add a standard WordPress blog set-up code to a virtual host.  The WordPress
   files should be rooted at the location you specify.}}
 
-val wordPress = \ host : (host) ->
+val wordPress = \ host : (host) -> \\ config : Vhost ->
   web host with
     addWordPress "/";
-    diskCache "/wp-content"
+    diskCache "/wp-content";
+    config
   end;
 {{Create a WordPress blog with just the standard set-up code.  The WordPress blog should
   be rooted at the vhost's <tt>DocumentRoot</tt>.}}
 
-val moin_default_htdocs : (location) = "/moin_static196";
+val moin_default_htdocs : (location) = "/moin_static199";
 {{Alias for static content used by the system-wide MoinMoin.}}
 
 val addMoinMoin = begin
@@ -30,18 +30,19 @@ val addMoinMoin = begin
   prefix <- Prefix;
   script <- Script;
 
-  alias htdocs "/afs/hcoop.net/common/app/moin/installed/moin19/lib/python2.6/site-packages/MoinMoin/web/static/htdocs";
-  diskCache htdocs;
+  alias htdocs "/afs/hcoop.net/common/app/moin/installed/moin19/lib/python2.7/site-packages/MoinMoin/web/static/htdocs";
+  (*diskCache htdocs;*) (* disabled 2017-02-01 clinton : don't think this helps after all *)
   scriptAlias prefix (end_in_slash script);
 end;
 {{Add a MoinMoin wiki to a vhost.}}
 
-val moinMoin = \ host : (host) ->
+val moinMoin = \ host : (host) -> \\ config : Vhost ->
   web host with
     addMoinMoin where
       Htdocs = moin_default_htdocs;
       Prefix = "/"
-    end
+    end;
+    config
   end;
 {{Create a new vhost with just a MoinMoin wiki.}}