From 2b7d9c9b064e3469bb2930cfcbf8170c4d649b91 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Thu, 12 Dec 2013 17:20:52 +0000 Subject: [PATCH 1/1] Move aside --- tools/apache2/DELETED/mkws-mike | 30 ++++++++++++++++++++++++++++++ tools/apache2/mkws-mike | 30 ------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 tools/apache2/DELETED/mkws-mike delete mode 100644 tools/apache2/mkws-mike diff --git a/tools/apache2/DELETED/mkws-mike b/tools/apache2/DELETED/mkws-mike new file mode 100644 index 0000000..7808b1f --- /dev/null +++ b/tools/apache2/DELETED/mkws-mike @@ -0,0 +1,30 @@ +# Configuration for the apache web server +# Running on Mike's local development box + + + 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. + + Allow from all + + diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike deleted file mode 100644 index 7808b1f..0000000 --- a/tools/apache2/mkws-mike +++ /dev/null @@ -1,30 +0,0 @@ -# Configuration for the apache web server -# Running on Mike's local development box - - - 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. - - Allow from all - - -- 1.7.10.4