From 66917548937612473978c77ac5f637a0b24df051 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Mon, 3 Nov 2014 12:16:31 +0000
Subject: [PATCH] Fix paths tools site running on Mike's Mac. (Using MacOS's
 own Apache2 instead of the one from MacPorts.) Remove old
 stanza defining x.example.indexdata.com. (That is now,
 corectly, provided by a separate file.)

---
 tools/apache2/mkws-mike-mac |   29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac
index d756148..7db0c62 100644
--- a/tools/apache2/mkws-mike-mac
+++ b/tools/apache2/mkws-mike-mac
@@ -3,16 +3,16 @@
 
 <VirtualHost *:80>
     ServerName x.mkws.indexdata.com
-    ErrorLog /opt/local/apache2/logs/mkws-error.log
-    CustomLog /opt/local/apache2/logs/mkws-access.log combined
+    ErrorLog /var/log/apache2/mkws-error.log
+    CustomLog /var/log/apache2/mkws-access.log combined
 
-    DocumentRoot /usr/local/src/git/mkws/tools/htdocs
-    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
-    Alias /pazpar2/ /usr/local/src/git/pazpar2/
+    DocumentRoot /Users/mike/git/work/mkws/tools/htdocs
+    Alias /libjs-pz2/ /Users/mike/git/work/libjs-pz2/
+    Alias /pazpar2/ /Users/mike/git/work/pazpar2/
 
     RewriteEngine on
     RewriteLogLevel 1
-    RewriteLog /opt/local/apache2/logs/spclient-rewrite.log 
+    RewriteLog /var/log/apache2/spclient-rewrite.log 
     RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
 
     # For MKC Service Proxy
@@ -24,20 +24,3 @@
         Allow from all
     </Directory>
 </VirtualHost>
-
-<VirtualHost *:80>
-    ServerName x.example.indexdata.com
-    ErrorLog /opt/local/apache2/logs/example-error.log
-    CustomLog /opt/local/apache2/logs/example-access.log combined
-
-    DocumentRoot /usr/local/src/git/mkws/examples/htdocs
-    Alias /tools/htdocs/ /usr/local/src/git/mkws/tools/htdocs/
-    Alias /src/ /usr/local/src/git/mkws/src/
-    Alias /jasmine/ /usr/local/src/git/mkws/examples/jasmine/
-    Alias /test/ /usr/local/src/git/mkws/test/
-
-    # Needed on Mac, which locks Apache down hard by default.
-    <Directory />
-        Allow from all
-    </Directory>
-</VirtualHost>
-- 
1.7.10.4