X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-mike-mac;h=d756148762f847ce487bd0c5bee614de0dda7b1b;hp=c416caec4f863ce99de24fcc52bfc0b9278e0a7c;hb=ef845d2595045ecf11ce99ec73ded148af69121f;hpb=4034d96a134331b082c863f969c191c2c24cd445

diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac
index c416cae..d756148 100644
--- a/tools/apache2/mkws-mike-mac
+++ b/tools/apache2/mkws-mike-mac
@@ -8,15 +8,33 @@
 
     DocumentRoot /usr/local/src/git/mkws/tools/htdocs
     Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
+    Alias /pazpar2/ /usr/local/src/git/pazpar2/
 
     RewriteEngine on
     RewriteLogLevel 1
     RewriteLog /opt/local/apache2/logs/spclient-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
 
     # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+
+    # Needed on Mac, which locks Apache down hard by default.
+    <Directory />
+        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 />