From 73fd385b9d92f5fe563dcb7a4aaea3f167aa6e9e Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 14 Dec 2018 13:21:32 +0900 Subject: [PATCH 1/8] bump spark and btcpay --- .../docker-fragments/bitcoin-clightning.yml | 2 +- docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 8e0a29c..a6ced4d 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -28,7 +28,7 @@ services: - nbxplorer - bitcoind clightning_bitcoin_spark: - image: shesek/spark-wallet:0.2.0-WIP + image: shesek/spark-wallet:0.2.1-standalone stop_signal: SIGKILL restart: unless-stopped environment: diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 14c2dba..c5d54d3 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.30} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.31} expose: - "49392" environment: From f6edd544626e05fbde5364a245fd27dc2f92947c Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 14 Dec 2018 13:21:45 +0900 Subject: [PATCH 2/8] Remove reference to restrictedMacaroons --- docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 2 +- docker-compose-generator/docker-fragments/litecoin-lnd.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 74f764e..9b9d189 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -41,7 +41,7 @@ services: environment: BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true" BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon" - BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;restrictedmacaroonfilepath=/etc/lnd_bitcoin/invoice.macaroon" + BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon" volumes: - "lnd_bitcoin_datadir:/etc/lnd_bitcoin" links: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml index 60f467b..dc949a3 100644 --- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml @@ -36,7 +36,7 @@ services: btcpayserver: environment: - BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;restrictedmacaroonfilepath=/etc/lnd_litecoin/invoice.macaroon;allowinsecure=true" + BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;allowinsecure=true" volumes: - "lnd_litecoin_datadir:/etc/lnd_litecoin" links: From 30427c0b6bd945350b44ec8d64adbf920ac74e61 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 14 Dec 2018 18:37:14 +0900 Subject: [PATCH 3/8] Add trailing / at the end of spark url --- .../docker-fragments/bitcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index a6ced4d..da0b152 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -44,7 +44,7 @@ services: btcpayserver: 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_BTCEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie" volumes: - "clightning_bitcoin_datadir:/etc/clightning_bitcoin" - "clightning_bitcoin_spark:/etc/clightning_bitcoin_spark" From d7c9c8779ddc588aefe701a76c1b5e6fff25c002 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 14 Dec 2018 19:15:41 +0900 Subject: [PATCH 4/8] bump nbx --- docker-compose-generator/docker-fragments/nbxplorer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 46e8738..0536b48 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.0.0.2 + image: nicolasdorier/nbxplorer:2.0.0.3 expose: - "32838" environment: From cb8cb7016786406ae819269279d3838673accee9 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 15 Dec 2018 00:00:30 +0900 Subject: [PATCH 5/8] bump nbxplorer --- docker-compose-generator/docker-fragments/nbxplorer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 0536b48..3314d01 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.0.0.3 + image: nicolasdorier/nbxplorer:2.0.0.7 expose: - "32838" environment: From bd348ddadc1407df81830d96c98d00eb8f14167e Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 17 Dec 2018 16:29:56 +0900 Subject: [PATCH 6/8] Decrease memory of opt-save-memory --- .../docker-fragments/opt-save-memory.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-save-memory.yml b/docker-compose-generator/docker-fragments/opt-save-memory.yml index 797c58f..1432cfb 100644 --- a/docker-compose-generator/docker-fragments/opt-save-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-save-memory.yml @@ -5,35 +5,35 @@ services: bitcoind: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 bgoldd: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 feathercoind: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 groestlcoind: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 litecoind: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 viacoind: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 monacoind: environment: BITCOIN_EXTRA_ARGS: | - dbcache=150 - maxmempool=100 + dbcache=50 + maxmempool=50 From 6389365448d3fdf16a261b0279ab93da175164af Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 17 Dec 2018 22:29:00 +0900 Subject: [PATCH 7/8] Change the default https host --- Production/nginx.tmpl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 8691739..c091e18 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -102,22 +102,6 @@ server { return 503; } -{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} -server { - server_name _; # This is just an invalid value which will never trigger on a real hostname. - listen 443 ssl http2; - {{ if $enable_ipv6 }} - listen [::]:443 ssl http2; - {{ end }} - access_log /var/log/nginx/access.log vhost; - return 503; - - ssl_session_tickets off; - ssl_certificate /etc/nginx/certs/default.crt; - ssl_certificate_key /etc/nginx/certs/default.key; -} -{{ end }} - {{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }} {{ $host := trim $host }} @@ -388,4 +372,20 @@ server { {{ end }} {{ end }} +{{ end }} + +{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} +server { + server_name _; # This is just an invalid value which will never trigger on a real hostname. + listen 443 ssl http2; + {{ if $enable_ipv6 }} + listen [::]:443 ssl http2; + {{ end }} + access_log /var/log/nginx/access.log vhost; + return 503; + + ssl_session_tickets off; + ssl_certificate /etc/nginx/certs/default.crt; + ssl_certificate_key /etc/nginx/certs/default.key; +} {{ end }} \ No newline at end of file From f0ac6d21068173defb8b47d56c9eb28ae43adefe Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 18 Dec 2018 15:57:16 +0900 Subject: [PATCH 8/8] Revert "Change the default https host" This reverts commit 6389365448d3fdf16a261b0279ab93da175164af. --- Production/nginx.tmpl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index c091e18..8691739 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -102,6 +102,22 @@ server { return 503; } +{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} +server { + server_name _; # This is just an invalid value which will never trigger on a real hostname. + listen 443 ssl http2; + {{ if $enable_ipv6 }} + listen [::]:443 ssl http2; + {{ end }} + access_log /var/log/nginx/access.log vhost; + return 503; + + ssl_session_tickets off; + ssl_certificate /etc/nginx/certs/default.crt; + ssl_certificate_key /etc/nginx/certs/default.key; +} +{{ end }} + {{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }} {{ $host := trim $host }} @@ -372,20 +388,4 @@ server { {{ end }} {{ end }} -{{ end }} - -{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} -server { - server_name _; # This is just an invalid value which will never trigger on a real hostname. - listen 443 ssl http2; - {{ if $enable_ipv6 }} - listen [::]:443 ssl http2; - {{ end }} - access_log /var/log/nginx/access.log vhost; - return 503; - - ssl_session_tickets off; - ssl_certificate /etc/nginx/certs/default.crt; - ssl_certificate_key /etc/nginx/certs/default.key; -} {{ end }} \ No newline at end of file