Add \\ config argument to moinMoin and wordPress

diff --git a/lib/web_apps.dtl b/lib/web_apps.dtl
index d9d6f5b..124a6d0 100644 (file)
--- a/lib/web_apps.dtl
+++ b/lib/web_apps.dtl
@@ -14,10 +14,11 @@ 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.}}
 
 {{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 "/";
   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>.}}
   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>.}}


@@ -36,12 +37,13 @@ val addMoinMoin = begin
 end;
 {{Add a MoinMoin wiki to a vhost.}}
 
 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 = "/"
   web host with
     addMoinMoin where
       Htdocs = moin_default_htdocs;
       Prefix = "/"

-    end
+    end;
+    config

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