X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fapache2%2Fmkws-test;h=23e744eab7c10d12f5fd94ef6efd5c7462ab57aa;hp=7dde2aa029221d7cefee7da271e644d519a4e8be;hb=d9392af31cad0e75d09f5dda9c82a30e6ce4476f;hpb=2fb712b40b54fdbb54fa7845e2e6007708f6e63b

diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index 7dde2aa..23e744e 100644
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -2,18 +2,29 @@
 
 # pazpar2 / service proxy config
 <VirtualHost *:80>
-    ServerName spclient.example.com
-    ServerAlias spclient-dev.indexdata.com mkws-dev.indexdata.com
-    ServerAdmin webmaster@example.com
-    ErrorLog /var/log/apache2/mkws-dev-error.log
-    CustomLog /var/log/apache2/mkws-dev-access.log combined
+    ServerName mkws-test.indexdata.com
+    ServerAlias mkws-test spclient-dev.indexdata.com
+    ServerAdmin webmaster@indexdata.com
+    ErrorLog /var/log/apache2/mkws-test-error.log
+    CustomLog /var/log/apache2/mkws-test-access.log combined
 
     RewriteEngine on
     RewriteLogLevel 1
-    RewriteLog /var/log/apache2/mkws-dev-rewrite.log 
+    RewriteLog /var/log/apache2/mkws-test-rewrite.log 
 
-    DocumentRoot /home/indexdata/mkws/examples/htdocs
-    Alias /tools/htdocs /home/indexdata/mkws/tools/htdocs
+    DocumentRoot /home/indexdata/mkws-test/examples/htdocs
+    Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+    Alias /src /home/indexdata/mkws-test/src
+    Alias /test /home/indexdata/mkws-test/test
+    Alias /jasmine /home/indexdata/mkws-test/examples/jasmine
+
+    Alias /demos/src /home/indexdata/mkws-test/src
+    Alias /demos/tools/htdocs /home/indexdata/mkws-test/tools/htdocs
+    Alias /demos /home/indexdata/demos
+
+    # CORS setting
+    Header set Access-Control-Allow-Credentials true
+    Header set Access-Control-Allow-Origin "*"
 
     # compress text output
     <Location />
@@ -21,10 +32,22 @@
         SetOutputFilter DEFLATE 
     </Location> 
 
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
-
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    # standard MKWS account
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkws&password=mkws [P]
+
+    # jasmine test account
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P]
+    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=kohademo&password=kohademo [P]
+    #RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P]
+
+    ProxyPass        /service-proxy/ http://sp-mkws02.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkws02.indexdata.com/service-proxy/
+    #ProxyPass        /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    #ProxyPass        /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
+    #ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
 
     ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
     ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/