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 9d6bb9f..e39dc4f 100644 (file)
--- a/lib/web_apps.dtl
+++ b/lib/web_apps.dtl
@@ -2,35 +2,58 @@
 
 val addWordPress = \ loc : (location) ->
   location loc with
+    rewriteRule "^(.*/)?\.svn/" "-" [forbidden, last];
+    rewriteRule "^(.*/)?\.git/" "-" [forbidden, last];
+
     rewriteCond "%{REQUEST_FILENAME}" "!-f" [];
     rewriteCond "%{REQUEST_FILENAME}" "!-d" [];
-    rewriteRule "." "/index.php" [last]
+
+    rewriteRule "." "/index.php" [last];
   end;
 {{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 "/"
+    addWordPress "/";
+    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_static198";
+{{Alias for static content used by the system-wide MoinMoin.}}
+
 val addMoinMoin = begin
   htdocs <- Htdocs;
   prefix <- Prefix;
   script <- Script;
 
-  alias htdocs "/usr/share/moin/htdocs";
-  scriptAlias prefix script
+  alias htdocs "/afs/hcoop.net/common/app/moin/installed/moin19/lib/python2.6/site-packages/MoinMoin/web/static/htdocs";
+  diskCache htdocs;
+  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
+    config;
     addMoinMoin where
-      Htdocs = "moin";
+      Htdocs = moin_default_htdocs;
       Prefix = "/"
-    end
+    end;
   end;
 {{Create a new vhost with just a MoinMoin wiki.}}
+
+(* Legacy version of moin macros *)
+
+val addMoinMoinOld = begin
+  htdocs <- Htdocs;
+  prefix <- Prefix;
+  script <- Script;
+
+  alias htdocs "/usr/share/moin/htdocs";
+  scriptAlias prefix (end_in_slash script)
+end;
+{{Add a MoinMoin wiki to a vhost.}}
\ No newline at end of file