Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

[mkws-moved-to-github.git] / examples / apache2 / mkws-examples-mike

diff --git a/examples/apache2/mkws-examples-mike b/examples/apache2/mkws-examples-mike
index 1b308ac..355226c 100644 (file)
--- a/examples/apache2/mkws-examples-mike
+++ b/examples/apache2/mkws-examples-mike
@@ -1,19 +1,12 @@
 <VirtualHost *:80>
     ServerName x.example.indexdata.com
     DocumentRoot /usr/local/src/git/mkws/examples/htdocs/
+    Alias /tools/htdocs/ /usr/local/src/git/mkws/tools/htdocs/
     ErrorLog /var/log/apache2/mkws-examples-error.log
     CustomLog /var/log/apache2/mkws-examples-access.log combined
 
     RewriteEngine on
-    RewriteRule      /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=demo&password=demo [P]
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName x.mkws.indexdata.com
-    DocumentRoot /usr/local/src/git/mkws/tools/htdocs/
-    ErrorLog /var/log/apache2/mkws-tools-error.log
-    CustomLog /var/log/apache2/mkws-tools-access.log combined
-
-    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
-    Alias /pazpar2/ /usr/local/src/git/pazpar2/
+    RewriteRule      /service-proxy-auth/ http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=mkws&password=mkws [P]
+    #RewriteLog /var/log/apache2/mkws-examples-rewrite.log
+    #RewriteLogLevel 9
 </VirtualHost>