gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ansible-taler-exchange] branch master updated: -fix config


From: gnunet
Subject: [ansible-taler-exchange] branch master updated: -fix config
Date: Sun, 19 Jan 2025 12:43:20 +0100

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

grothoff pushed a commit to branch master
in repository ansible-taler-exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 159791d  -fix config
159791d is described below

commit 159791d6480ef3dc8e7d70b6aa6c1a6b65c5768a
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jan 19 12:43:17 2025 +0100

    -fix config
---
 roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2 
b/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2
index 13311cd..e6db3a4 100644
--- a/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2
+++ b/roles/libeufin-nexus/templates/etc/libeufin/libeufin-nexus.conf.j2
@@ -41,13 +41,8 @@ CONFIG=postgres:///libeufin
 
 [nexus-httpd-wire-gateway-api]
 ENABLED = YES
-<<<<<<< Updated upstream
-AUTH_METHOD = bearer-token
-AUTH_BEARER_TOKEN = {{ 
ansible_facts['ansible_local']['libeufin-nexus-access-token']['libeufin-nexus']['auth_bearer_token']
 }}
-=======
 AUTH_METHOD = bearer
 TOKEN = {{ 
ansible_facts['ansible_local']['libeufin-nexus-access-token']['libeufin-nexus']['auth_bearer_token']
 }}
->>>>>>> Stashed changes
 
 # FIXME: is this supported by libeufin?
 @inline-secret@ nexus-ebics libeufin-nexus-ebics.conf

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]