X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-live;h=989e2ef1477436f43302b9b18360bd2193305995;hb=11cdce6a5654ac6a54938e6faa1b2539c3b5729d;hp=dfa7ed4758945f902a503ef4d2b98f7d85d7a30d;hpb=39aa1afba01fe4a7cef82c0f13b3e389203996b8;p=mkws-moved-to-github.git
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index dfa7ed4..989e2ef 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -1,39 +1,28 @@
# 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
+ 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/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/ /usr/share/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]
-
- 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/
+ # 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&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]
- PerlOptions +Parent
- PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
-
- PerlOutputFilterHandler MyApache2::SetACAO
-
+ RewriteRule /service-proxy/ /no-service-proxy.html