--- /dev/null
+# Configuration for the apache web server
+# Running on Mike's local development box
+
+<VirtualHost *:80>
+ ServerName x.mkws.indexdata.com
+ 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/
+
+ RewriteEngine on
+ RewriteLogLevel 1
+ RewriteLog /var/log/apache2/spclient-rewrite.log
+ RewriteRule /service-proxy-auth /service-proxy/?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/
+
+ # For local Service Proxy running as mvn jetty:run
+ #ProxyPass /service-proxy/ http://localhost:8585/service-proxy/
+ #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
+
+ # Needed on Mac, which locks Apache down hard by default.
+ <Directory />
+ Allow from all
+ </Directory>
+</VirtualHost>
+++ /dev/null
-# Configuration for the apache web server
-# Running on Mike's local development box
-
-<VirtualHost *:80>
- ServerName x.mkws.indexdata.com
- 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/
-
- RewriteEngine on
- RewriteLogLevel 1
- RewriteLog /var/log/apache2/spclient-rewrite.log
- RewriteRule /service-proxy-auth /service-proxy/?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/
-
- # For local Service Proxy running as mvn jetty:run
- #ProxyPass /service-proxy/ http://localhost:8585/service-proxy/
- #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
-
- # Needed on Mac, which locks Apache down hard by default.
- <Directory />
- Allow from all
- </Directory>
-</VirtualHost>