X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-live;h=989e2ef1477436f43302b9b18360bd2193305995;hp=630170d5c470fe34d69106147562c69e64a878e3;hb=ba257cef2488dc5dbe3ea0ccbf4251c4d53dffbf;hpb=c86e3d428ef2000d17d47a31c7c20e70a6d9be8c

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 630170d..989e2ef 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -3,72 +3,26 @@
 
 <VirtualHost *:80>
     ServerName mkws.indexdata.com
+    ServerAlias mkws01.indexdata.com
+    ServerAlias mkws02.indexdata.com
 
     ErrorLog /var/log/apache2/mkws-error.log
     CustomLog /var/log/apache2/mkws-access.log combined
 
     DocumentRoot /home/indexdata/mkws/tools/htdocs
     Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
-    Alias /pazpar2/ /home/indexdata/pazpar2/
+    Alias /pazpar2/ /usr/share/pazpar2/
 
     RewriteEngine on
     RewriteLogLevel 1
     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>
-</VirtualHost>
-
-# Separate hostname for the MKWS instance of the Service Proxy.
-# This allows us to use a different SP configuration that handles
-# authentication differently.
-#
-# Once this is in universal use, we can get rid of the Service Proxy
-# stuff in the configuration for mkws.indexdata.com
-#
-<VirtualHost *:80>
-    ServerName sp-mkws.indexdata.com
-
-    ErrorLog /var/log/apache2/sp-mkws-error.log
-    CustomLog /var/log/apache2/sp-mkws-access.log combined
-
-    DocumentRoot /home/indexdata/mkws/tools/sp-htdocs
-
-    # No rewriting on this server: use the true URL.
-    # (The security value of rewrite is when the application site does it.)
-
-    Header set Access-Control-Allow-Credentials true
-
-    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>