From: Wolfram Schneider Date: Wed, 21 Jan 2015 13:28:23 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=a1673ee07593ee4af700426523534b5188ab4d4e;hp=31b71364510f02daa1219b4a6dc91ecd8a838729 Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws --- diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test index 54813dd..23e744e 100644 --- a/tools/apache2/mkws-test +++ b/tools/apache2/mkws-test @@ -18,6 +18,9 @@ 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 @@ -37,8 +40,10 @@ 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-mkc-sansa.indexdata.com:8080/service-proxy/ - ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/ + 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/