changed SP host from 'mkc.indexdata.com:9009' to 'sp-mkc.indexdata.com' which points...

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 4ca23d8..6d19365 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -23,8 +23,8 @@
 
     RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
 
-    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/
 
     ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
     ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/

diff --git a/tools/apache2/mkws-git b/tools/apache2/mkws-git
new file mode 100644 (file)
index 0000000..798d561
--- /dev/null
+++ b/tools/apache2/mkws-git
@@ -0,0 +1,35 @@
+# Configuration for the apache web server
+# Running on caliban FROM AN UP-TO-DATE UNSTABLE GIT CHECKOUT
+
+<VirtualHost *:80>
+    ServerName mkws-git.indexdata.com
+
+    ErrorLog /var/log/apache2/mkws-git-error.log
+    CustomLog /var/log/apache2/mkws-git-access.log combined
+
+    DocumentRoot /home/indexdata/mkws-git/tools/htdocs
+    Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/mkws-git-rewrite.log 
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    # The following rule allows the server to accept service-proxy
+    # requests that begin with an escaped "%3F" rather than a literal
+    # "?". This is useful, as requests generated by ProxyPass
+    # elsewhere always have the leading "?" escaped for some reason.
+    RewriteRule /service-proxy/\?(.*) /service-proxy/?$1 [P] # [NE,P]
+
+    Header set Access-Control-Allow-Credentials true
+
+    # For MKC Service Proxy
+    ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+
+    PerlOptions +Parent
+    PerlSwitches -I/home/indexdata/mkws-git/tools/mod_perl
+    <Location /service-proxy>
+        PerlOutputFilterHandler MyApache2::SetACAO
+    </Location>
+</VirtualHost>

diff --git a/tools/apache2/mkws-mike-mac b/tools/apache2/mkws-mike-mac
index 8f9d5a3..c6ade11 100644 (file)
--- a/tools/apache2/mkws-mike-mac
+++ b/tools/apache2/mkws-mike-mac
@@ -16,8 +16,8 @@
     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/
+    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 />