X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fapache2%2Fmkws-live;h=630170d5c470fe34d69106147562c69e64a878e3;hb=cd1388ebf3b69038d495f12e120bdfc02a2e7aa2;hp=283c3acdec2e3ee700ec7b4dfd2c4a12c200936d;hpb=a394095d80ef474d02cb012aba4c2fd7bbcc5cc1;p=mkws-moved-to-github.git
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 283c3ac..630170d 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -19,7 +19,8 @@
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,check,login&username=kohademo&password=kohademo [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]
# The following rule allows the server to accept service-proxy
# requests that begin with an escaped "%3F" rather than a literal
@@ -32,6 +33,38 @@
# 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
+
+ PerlOutputFilterHandler MyApache2::SetACAO
+
+
+
+# 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
+#
+
+ 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