From: Mike Taylor <mike@indexdata.com>
Date: Tue, 3 Jun 2014 15:14:35 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~556
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=b66b553f30e615de1ddf33d798f8d0cf574afbec;hp=2c1e04b172e1e248e784acfd168a4520c8011ef9

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/test/Makefile b/test/Makefile
index 77e1a6f..9ee3b80 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,7 +14,7 @@ IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bin/bomb.pl
 TMP_DIR=	./logs
-APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
+APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
 
 all: check
 
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 924730b..379c07e 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -19,7 +19,7 @@
     RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkws&password=mkws [P] # [NE,P]
     RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
     RewriteRule /service-proxy-credoauth  /service-proxy/?command=auth&action=login&username=credo&password=emu [P] # [NE,P]
-    RewriteRule /service-proxy-kohaauth  /service-proxy/?command=auth&action=check,login&username=mkwstest&password=mkwstest [P]
+    RewriteRule /service-proxy-kohaauth  /service-proxy/?command=auth&action=check,login&username=kohademo&password=kohademo [P]
 
     # The following rule allows the server to accept service-proxy
     # requests that begin with an escaped "%3F" rather than a literal