X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-live;h=0630d148b30ae20f5e989522c1091e3b3ffc17f2;hb=cda7d85862a85b0841478d87a086582cb02ba002;hp=dfa7ed4758945f902a503ef4d2b98f7d85d7a30d;hpb=39aa1afba01fe4a7cef82c0f13b3e389203996b8;p=mkws-moved-to-github.git
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index dfa7ed4..0630d14 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -1,38 +1,42 @@
# Configuration for the apache web server
# Running on caliban
-
-
- ServerName somesite.indexdata.com
- DocumentRoot /home/indexdata/mkws/experiments/spclient/
- ErrorLog /var/log/apache2/somesite-error.log
- CustomLog /var/log/apache2/somesite-access.log combined
-
-
-
ServerName mkws.indexdata.com
ErrorLog /var/log/apache2/mkws-error.log
CustomLog /var/log/apache2/mkws-access.log combined
- DocumentRoot /home/indexdata/mkws/experiments/spclient/
+ DocumentRoot /home/indexdata/mkws/tools/htdocs
Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
- Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
+ Alias /pazpar2/ /home/indexdata/pazpar2/
RewriteEngine on
RewriteLogLevel 1
RewriteLog /var/log/apache2/mkws-rewrite.log
- RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
+
+ # 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]
+
+ # 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://mk2-test.indexdata.com/service-proxy/
- ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/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/etc/mod_perl
+ PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
PerlOutputFilterHandler MyApache2::SetACAO