web_apps: don't instantiate php5 in wordPress

[hcoop/domtool2.git] / lib / web_apps.dtl

diff --git a/lib/web_apps.dtl b/lib/web_apps.dtl
index d9d6f5b..e39dc4f 100644 (file)
--- 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,10 +13,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.}}
 
-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>.}}
@@ -36,12 +36,13 @@ val addMoinMoin = begin
 end;
 {{Add a MoinMoin wiki to a vhost.}}
 
-val moinMoin = \ host : (host) ->
+val moinMoin = \ host : (host) -> \\ config : Vhost ->
   web host with
+    config;
     addMoinMoin where
       Htdocs = moin_default_htdocs;
       Prefix = "/"
-    end
+    end;
   end;
 {{Create a new vhost with just a MoinMoin wiki.}}