From 54a85a40befa60acb1d1b191a6263a40509b2584 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 21 Dec 2018 16:46:21 +0900
Subject: [PATCH] charge integration

---
 Production/nginx.tmpl                         |  5 +++++
 .../docker-fragments/bitcoin-clightning.yml   | 19 ++++++++++++++++++-
 .../docker-fragments/btcpayserver.yml         |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 8691739..aeeb5a6 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -321,6 +321,11 @@ server {
 		{{ if (eq $serviceName "clightning_bitcoin_spark") }}
 	location /spark/btc/ {
 		proxy_pass http://clightning_bitcoin_spark:9737/;
+	}
+		{{ end }}
+		{{ if (eq $serviceName "clightning_bitcoin_charge") }}
+	location /ligthning-charge/btc/ {
+		proxy_pass http://clightning_bitcoin_charge:9112/;
 	}
 		{{ end }}
 	{{ end }}
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index da0b152..c920bf5 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -27,6 +27,20 @@ services:
     links:
       - nbxplorer
       - bitcoind
+  clightning_bitcoin_charge:
+    image: shesek/lightning-charge:0.4.6-standalone
+    restart: unless-stopped
+    environment:
+      NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      COOKIE_FILE: /data/.cookie
+      CHARGE_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}ligthning-charge/btc/
+    volumes:
+      - "clightning_bitcoin_datadir:/etc/lightning"
+      - "clightning_bitcoin_charge:/data"
+    expose:
+      - "9112"
+    links:
+      - clightning_bitcoin
   clightning_bitcoin_spark:
     image: shesek/spark-wallet:0.2.1-standalone
     stop_signal: SIGKILL
@@ -45,11 +59,14 @@ services:
     environment:
       BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc"
       BTCPAY_BTCEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie"
+      BTCPAY_BTCEXTERNALCHARGE: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}ligthning-charge/btc/;cookiefilepath=/etc/clightning_bitcoin_charge/.cookie"
     volumes:
       - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
       - "clightning_bitcoin_spark:/etc/clightning_bitcoin_spark"
+      - "clightning_bitcoin_charge:/etc/clightning_bitcoin_charge"
     links:
       - clightning_bitcoin
 volumes:
   clightning_bitcoin_datadir:
-  clightning_bitcoin_spark:
\ No newline at end of file
+  clightning_bitcoin_spark:
+  clightning_bitcoin_charge:
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index 4db082d..cba6db0 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.33}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.34}
     expose:
       - "49392"
     environment: