Merge branch 'master' into templateallthemarkup

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 54a1b64..74c384f 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -22,25 +22,5 @@
     RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=kohademo&password=kohademo&identity=demo_koha_mkws [P]
     RewriteRule /service-proxy-orexauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=orex&password=orexmkc&identity=orex_digital2 [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
-#    ProxyPreserveHost On
-    #ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
-    #ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
-    ProxyPass        /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
-    # Or use: sp-mkc-sansa.indexdata.com:8080 or sp-mkc-arya.indexdata.com:8080
-
-    PerlOptions +Parent
-    PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
-    <Location /service-proxy>
-        PerlOutputFilterHandler MyApache2::SetACAO
-    </Location>
+    RewriteRule /service-proxy/        /no-service-proxy.html
 </VirtualHost>

diff --git a/tools/htdocs/no-service-proxy.html b/tools/htdocs/no-service-proxy.html
new file mode 100644 (file)
index 0000000..b1a5f15
--- /dev/null
+++ b/tools/htdocs/no-service-proxy.html
@@ -0,0 +1,3 @@
+There is no /service-proxy/ on mkws.indexdata.com.
+<p>
+You probably want to use http://sp-mkws.indexdata.com/service-proxy/