From: Wolfram Schneider Date: Mon, 22 Sep 2014 13:39:47 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 1.0.0~324^2~24^2^2 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=ae0daa2bfc219cb0d0a0db52d5e83bcce8165923;hp=5ae16f60a7d39560faa5d2f7d799d1dd2eff2758 Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev index 582af95..9b426fb 100644 --- a/tools/apache2/mkws-dev +++ b/tools/apache2/mkws-dev @@ -35,8 +35,8 @@ # mkws devel account (e.g. memached testing) RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P] - ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/ - ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/ + ProxyPass /service-proxy/ http://sp-mkws.indexdata.com/service-proxy/ + ProxyPassReverse /service-proxy/ http://sp-mkws.indexdata.com/service-proxy/ ProxyPass /pazpar2/ http://localhost:8004/pazpar2/ ProxyPassReverse /pazpar2/ http://localhost:8004/pazpar2/