Force php in wordpress locations to version 5

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

diff --git a/lib/web_apps.dtl b/lib/web_apps.dtl
index 9d6bb9f..0ae5222 100644 (file)
--- a/lib/web_apps.dtl
+++ b/lib/web_apps.dtl
@@ -2,6 +2,7 @@
 
 val addWordPress = \ loc : (location) ->
   location loc with
+    phpVersion php5;
     rewriteCond "%{REQUEST_FILENAME}" "!-f" [];
     rewriteCond "%{REQUEST_FILENAME}" "!-d" [];
     rewriteRule "." "/index.php" [last]
@@ -22,14 +23,14 @@ val addMoinMoin = begin
   script <- Script;
 
   alias htdocs "/usr/share/moin/htdocs";
-  scriptAlias prefix script
+  scriptAlias prefix (end_in_slash script)
 end;
 {{Add a MoinMoin wiki to a vhost.}}
 
 val moinMoin = \ host : (host) ->
   web host with
     addMoinMoin where
-      Htdocs = "moin";
+      Htdocs = "/moin";
       Prefix = "/"
     end
   end;