From c6c290506cc5f2992cdf2bc552d79499ae502249 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 25 Feb 2019 01:31:53 +0900 Subject: [PATCH] Revert "add rtl" This reverts commit 2df6f2b5bacf194709059c2484334f568a54d888. --- Production/nginx.tmpl | 8 ++----- .../docker-fragments/bitcoin-lnd.yml | 24 +------------------ 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 9867d12..51cbf67 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -1,4 +1,5 @@ -{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }} +{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }} + {{ define "upstream" }} {{ if .Address }} {{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}} @@ -309,11 +310,6 @@ server { location /lnd-rest/btc/ { rewrite ^/lnd-rest/btc/(.*) /$1 break; proxy_pass http://lnd_bitcoin:8080/; - } - {{ end }} - {{ if (eq $serviceName "lnd_bitcoin_rtl") }} - location /rtl/ { - proxy_pass http://lnd_bitcoin_rtl:3000/rtl/; } {{ end }} {{ if (eq $serviceName "btcqbo") }} diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 57ac939..6169386 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -37,34 +37,13 @@ services: - nbxplorer - bitcoind - lnd_bitcoin_rtl: - image: shahanafarooqui/rtl:0.2.10 - restart: unless-stopped - environment: - LND_SERVER_URL: http://lnd_bitcoin:8080/v1 - MACAROON_PATH: /etc/lnd - LND_CONFIG_PATH: /etc/lnd/lnd.conf - RTL_CONFIG_PATH: /data/RTL.conf - BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf - RTL_SSO: 1 - RTL_COOKIE_PATH: /data/.cookie - LOGOUT_REDIRECT_LINK: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/server/services - volumes: - - "bitcoin_datadir:/etc/bitcoin" - - "lnd_bitcoin_datadir:/etc/lnd" - - "lnd_bitcoin_rtl_datadir:/data" - expose: - - "3000" - btcpayserver: environment: BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true" - BTCPAY_BTCEXTERNALRTL: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}rtl/api/authenticate/cookie;cookiefile=/etc/lnd_bitcoin_rtl/.cookie" BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;macaroondirectorypath=/etc/lnd_bitcoin" BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;macaroondirectorypath=/etc/lnd_bitcoin" volumes: - "lnd_bitcoin_datadir:/etc/lnd_bitcoin" - - "lnd_bitcoin_rtl_datadir:/etc/lnd_bitcoin_rtl" links: - lnd_bitcoin @@ -89,5 +68,4 @@ services: - "lnd_bitcoin_datadir:/lnd" volumes: - lnd_bitcoin_datadir: - lnd_bitcoin_rtl_datadir: + lnd_bitcoin_datadir: \ No newline at end of file