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

diff --git a/test/Makefile b/test/Makefile
index 77e1a6f..9ee3b80 100644 (file)
--- 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 (file)
--- 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