X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-live;h=74c384fc3b245923f3a7f7c3b80e9e04ec3c515b;hp=a2e8129a22c45cb4234cd6bdf53d3e521bdb269f;hb=f76f7f57216be12f1690b7ebc5bd941c4ed77ab0;hpb=0037b1f1306972f223ee2c37355efe6cd10a9a57

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index a2e8129..74c384f 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -16,25 +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 /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
-    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
-    RewriteRule /service-proxy-credoauth  /service-proxy/?command=auth&action=login&username=credo&password=emu [P] # [NE,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/
-
-    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>