From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 5 Apr 2011 04:25:10 +0000 (+0000)
Subject: In the HipHop server:
X-Git-Tag: 1.31.0-rc.0~31012
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=2d1e125646c1cad3343d7e41a7c7b667ef4fbba7;p=lhc%2Fweb%2Fwiklou.git

In the HipHop server:
* Serve static content.
* Less verbose logging, we don't really need a notice for every SQL query.
---

diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server
index bfd55f5321..415bf64034 100755
--- a/maintenance/hiphop/run-server
+++ b/maintenance/hiphop/run-server
@@ -1,9 +1,11 @@
 #!/bin/bash
 
 sourceDir=`dirname "$0"`
+sourceRoot=`readlink -f "$sourceDir/../.."`
 
 "$sourceDir"/build/persistent/mediawiki-hphp \
 	-c "$sourceDir/server.conf" \
+	-v Server.SourceRoot="$sourceRoot" \
 	--mode=server \
 	--port=8080
 
diff --git a/maintenance/hiphop/server.conf b/maintenance/hiphop/server.conf
index a8cf0b1195..8c53ab5c0c 100644
--- a/maintenance/hiphop/server.conf
+++ b/maintenance/hiphop/server.conf
@@ -1,5 +1,5 @@
 Log {
-	Level = Verbose
+	Level = Warning
 	UseLogFile = true
 	File = /dev/stdout
 	NativeStackTrace = true
@@ -11,3 +11,6 @@ Debug {
 	ServerErrorMessage = true
 	TranslateSource = true
 }
+Server {
+	EnableStaticContentFromDisk = true
+}