[taler-donau] 04/05: resolve merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a commit to branch master
in repository donau.

commit 1c97e42acc42ea64a41d1b9f7688842430e126bb
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Fri Jan 5 15:09:18 2024 +0100

    resolve merge
---
 src/donau/Makefile.am              |  3 ---
 src/testing/donau-unified-setup.sh | 10 +++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am
index af03663..02cb450 100644
--- a/src/donau/Makefile.am
+++ b/src/donau/Makefile.am
@@ -19,9 +19,6 @@ pkgcfg_DATA = \
 bin_PROGRAMS = \
   donau-httpd
 
-donau_httpd_SOURCES = \
-  donau-httpd.c donau-httpd.h
-
 donau_httpd_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
diff --git a/src/testing/donau-unified-setup.sh 
b/src/testing/donau-unified-setup.sh
index 34111ad..8094192 100755
--- a/src/testing/donau-unified-setup.sh
+++ b/src/testing/donau-unified-setup.sh
@@ -471,9 +471,9 @@ then
         DONAU_URL="http://localhost:${DONAU_PORT}/";
     fi
     donau-dbinit -c "$CONF" --reset
-    $USE_VALGRIND taler-exchange-secmod-eddsa -c "$CONF" -L "$LOGLEVEL" 2> 
taler-exchange-secmod-eddsa.log &
-    $USE_VALGRIND taler-exchange-secmod-rsa -c "$CONF" -L "$LOGLEVEL" 2> 
taler-exchange-secmod-rsa.log &
-    $USE_VALGRIND taler-exchange-secmod-cs -c "$CONF" -L "$LOGLEVEL" 2> 
taler-exchange-secmod-cs.log &
+    $USE_VALGRIND taler-secmod-eddsa -c "$CONF" -L "$LOGLEVEL" -s donau 2> 
donau-secmod-eddsa.log &
+    $USE_VALGRIND taler-secmod-rsa -c "$CONF" -L "$LOGLEVEL" -s donau 2> 
donau-secmod-rsa.log &
+    $USE_VALGRIND taler-secmod-cs -c "$CONF" -L "$LOGLEVEL" -s donau 2> 
donau-secmod-cs.log &
     $USE_VALGRIND donau-httpd -c "$CONF" -L "$LOGLEVEL" 2> donau-httpd.log &
     echo " DONE"
 fi
@@ -780,7 +780,7 @@ fi
 
 if [ "1" = "$START_DONAU" ]
 then
-    echo -n "Wait for donau /management/keys to be ready "
+    echo -n "Wait for donau /keys to be ready "
     OK="0"
     LAST_RESPONSE=$(mktemp tmp-last-response.XXXXXXXX)
     for n in $(seq 1 10)
@@ -792,7 +792,7 @@ then
             --tries=3 \
             --waitretry=0 \
             --timeout=30 \
-            "${DONAU_URL}management/keys"\
+            "${DONAU_URL}keys"\
             -o /dev/null \
             -O "$LAST_RESPONSE" \
             >/dev/null || continue

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.