lib/moin: update for 1.9.9, fix config order

User provided config must go after moin ScriptAlias on "/", otherwise
user aliases will never match.

diff --git a/lib/web_apps.dtl b/lib/web_apps.dtl
index e39dc4f..e73e1ac 100644 (file)
--- a/lib/web_apps.dtl
+++ b/lib/web_apps.dtl
@@ -22,7 +22,7 @@ val wordPress = \ host : (host) -> \\ config : Vhost ->
 {{Create a WordPress blog with just the standard set-up code.  The WordPress blog should
   be rooted at the vhost's <tt>DocumentRoot</tt>.}}
 
 {{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_static198";
+val moin_default_htdocs : (location) = "/moin_static199";

 {{Alias for static content used by the system-wide MoinMoin.}}
 
 val addMoinMoin = begin
 {{Alias for static content used by the system-wide MoinMoin.}}
 
 val addMoinMoin = begin


@@ -30,19 +30,19 @@ val addMoinMoin = begin
   prefix <- Prefix;
   script <- Script;
 
   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) -> \\ config : Vhost ->
   web host with
   scriptAlias prefix (end_in_slash script);
 end;
 {{Add a MoinMoin wiki to a vhost.}}
 
 val moinMoin = \ host : (host) -> \\ config : Vhost ->
   web host with

-    config;

     addMoinMoin where
       Htdocs = moin_default_htdocs;
       Prefix = "/"
     end;
     addMoinMoin where
       Htdocs = moin_default_htdocs;
       Prefix = "/"
     end;

+    config

   end;
 {{Create a new vhost with just a MoinMoin wiki.}}
 
   end;
 {{Create a new vhost with just a MoinMoin wiki.}}