Fix MKWS-321

[mkws-moved-to-github.git] / tools / apache2 / mkws-live

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 0630d14..74c384f 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -16,28 +16,11 @@
     RewriteLog /var/log/apache2/mkws-rewrite.log 
 
     # Credential-hiding rewrite rules for standard MKWS account, testing account and various application accounts
-    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?       /service-proxy/$2?command=auth&action=check,login&username=mkws&password=mkws [P]
-    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=mkwstest&password=mkwstest [P]
-    RewriteRule /service-proxy-credoauth(/)?(;jsessionid=.+)?          /service-proxy/$2?command=auth&action=check,login&username=credo&password=emu [P]
-    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=kohademo&password=kohademo [P]
-    RewriteRule /service-proxy-orexauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=orex&password=orexmkc [P]
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?       /service-proxy/$2?command=auth&action=check,login&username=mkws&password=mkws&identity=mkws [P]
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=mkwstest&password=mkwstest&identity=mkws_test [P]
+    RewriteRule /service-proxy-credoauth(/)?(;jsessionid=.+)?          /service-proxy/$2?command=auth&action=check,login&username=credo&password=emu&identity=testing_credo_emulator [P]
+    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
-    ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/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>