[libeufin] branch master updated (86cd6a7 -> 6269386)

[gnunet]

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

ms pushed a change to branch master
in repository libeufin.

    from 86cd6a7  systemd gives env via file
     new 436ec76  fix cli test harness
     new cb2cb2c  remove blank line
     new 6269386  unit files read port from env

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cli/setup-template.sh  | 9 +++++----
 debian/nexus.service   | 4 ++--
 debian/sandbox.service | 2 +-
 util/build.gradle      | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/setup-template.sh b/cli/setup-template.sh
index 511850f..9a468d7 100755
--- a/cli/setup-template.sh
+++ b/cli/setup-template.sh
@@ -34,15 +34,17 @@ NEXUS_BANK_CONNECTION_NAME=b
 export LIBEUFIN_NEXUS_URL=$NEXUS_URL \
        LIBEUFIN_NEXUS_USERNAME=$NEXUS_USER \
        LIBEUFIN_NEXUS_PASSWORD=$NEXUS_PASSWORD \
-       LIBEUFIN_SANDBOX_URL=$SANDBOX_URL
+       LIBEUFIN_SANDBOX_URL=$SANDBOX_URL \
+       LIBEUFIN_NEXUS_DB_CONNECTION=$DATABASE_CONN \
+       LIBEUFIN_SANDBOX_DB_CONNECTION=$DATABASE_CONN
 
 echo Remove old database.
 rm -f $SQLITE_FILE
 
 echo Start services.
-libeufin-nexus serve --db-conn-string=$DATABASE_CONN &> nexus.log &
+libeufin-nexus serve &> nexus.log &
 nexus_pid=$!
-libeufin-sandbox serve --db-conn-string=$DATABASE_CONN &> sandbox.log &
+libeufin-sandbox serve &> sandbox.log &
 sandbox_pid=$!
 
 trap "echo Terminating services.; kill $nexus_pid; kill $sandbox_pid" EXIT
@@ -88,7 +90,6 @@ libeufin-cli \
 echo "Creating a nexus superuser"
 libeufin-nexus \
   superuser \
-    --db-conn-string=$DATABASE_CONN \
     --password $NEXUS_PASSWORD $NEXUS_USER
 
 # create a bank connection
diff --git a/debian/nexus.service b/debian/nexus.service
index 9c389a8..dde9be2 100644
--- a/debian/nexus.service
+++ b/debian/nexus.service
@@ -2,6 +2,6 @@
 Description=LibEuFin Nexus service.
 
 [Service]
-ExecStart=/usr/bin/libeufin-nexus serve
+ExecStart=/usr/bin/libeufin-nexus serve --port=$LIBEUFIN_NEXUS_PORT
 Restart=on-failure
-EnvironmentFile=%h/.config/libeufinnexusenv
+EnvironmentFile=/etc/libeufin/libeufinenv.conf
diff --git a/debian/sandbox.service b/debian/sandbox.service
index 24d080c..9717707 100644
--- a/debian/sandbox.service
+++ b/debian/sandbox.service
@@ -2,6 +2,6 @@
 Description=LibEuFin Sandbox service.
 
 [Service]
-ExecStart=/usr/bin/libeufin-sandbox serve
+ExecStart=/usr/bin/libeufin-sandbox serve --port=$LIBEUFIN_SANDBOX_PORT
 Restart=on-failure
 EnvironmentFile=%h/.config/libeufinsandboxenv
diff --git a/util/build.gradle b/util/build.gradle
index 72f90c0..931a10b 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -45,7 +45,6 @@ dependencies {
     // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', 
version: '1.4.0'
 
-
     implementation "org.jetbrains.exposed:exposed-core:$exposed_version"
     implementation "org.jetbrains.exposed:exposed-dao:$exposed_version"
 

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