Merge branch 'master' into wosch

[mkws-moved-to-github.git] / tools / apache2 / mkws-dev

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index b4a7e8a..4ca23d8 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -3,16 +3,23 @@
 # pazpar2 / service proxy config
 <VirtualHost *:80>
     ServerName spclient.example.com
-    ServerAlias spclient-dev.indexdata.com
+    ServerAlias spclient-dev.indexdata.com mkws-dev.indexdata.com
     ServerAdmin webmaster@example.com
-    ErrorLog /var/log/apache2/spdemo-error.log
-    CustomLog /var/log/apache2/spdemo-access.log combined
+    ErrorLog /var/log/apache2/mkws-dev-error.log
+    CustomLog /var/log/apache2/mkws-dev-access.log combined
 
     RewriteEngine on
     RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spdemo-rewrite.log 
+    RewriteLog /var/log/apache2/mkws-dev-rewrite.log 
 
-    DocumentRoot /home/indexdata/mkws/experiments/spclient
+    DocumentRoot /home/indexdata/mkws/examples/htdocs
+    Alias /tools/htdocs /home/indexdata/mkws/tools/htdocs
+
+    # compress text output
+    <Location />
+        AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
+        SetOutputFilter DEFLATE 
+    </Location> 
 
     RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]