Bump (#4)

* update dogecoin (btcpayserver#483) * chore: bump thunderhub (btcpayserver#479) * Update doc * Bump GRS Core and c-lightning (btcpayserver#484) * Bump GRS Core and c-lightning * Update eclair * Update BitCore version to 0.90.9.10 (btcpayserver#474) Co-authored-by: dalijolijo <[email protected]> * Separate default liquid prune to own fragment (btcpayserver#457) This allows users who dont want to prune their liquid node to exclude the pruning fragment. (allows rescanning for utxos) * opt-*-memory supported by doge * Upgrade Sphinx Relay to v2.1.3 * S3 backup provider (btcpayserver#438) * Add S3 backup provider Allows upload to S3 * Update backup.sh * Update backup.sh Co-authored-by: britttttk <[email protected]> * Update backup.sh Co-authored-by: britttttk <[email protected]> * Update tor * Revert "Update tor" This reverts commit 365e990. * Revert "Revert "Update tor"" This reverts commit a770141. * bump transmuter * Add Tallycoin Connect fragment * Update to latest tallycoin_connect version * Finalize Tallycoin Connect integration * Add fragment to enable LND watchtower client * Add opt-lnd-wtclient fragment description in README * Add ability to customize watchtower sweep fee * remove quotes from wtclient fragment * Save LND_WTCLIENT_SWEEP_FEE to environment file * Bump BTCPay/NBX (btcpayserver#505) * Bump LND to v0.13.1-beta-withloop (btcpayserver#506) * bump Clightning to 0.10.1 (btcpayserver#507) * Update doc * Revert "Bump LND to v0.13.1-beta-withloop (btcpayserver#506)" This reverts commit 7574612. * Hotfix for problems with LND 0.13.1 (btcpayserver#508) * Revert "Revert "Bump LND to v0.13.1-beta-withloop (btcpayserver#506)"" This reverts commit b9777f9. * Fetching version that waits for proper wallet unlock state before proceeding * bump * Bump RTL and Clightning-rest Only for clightning, separate PR for lnd * Update docker builder * chore: update to dash 0.17.0.3 (btcpayserver#509) * chore: update to dash 0.17.0.3 * chore: update dash.conf defaults * Bump RTL * Update Tallycoin Connect to v1.4.0 * Update Sphinx Relay to v2.2.0 * bump btcpay * Update NBX * Update liquid.yml * bump nbx * bump nbx * Update bitcoin-clightning.yml * bump nnbx * bump nbx * bump nbx * Bump btcpay * Revert "Bump btcpay" This reverts commit 64fe7db. * Revert "Revert "Bump btcpay"" This reverts commit 40f2765. * Bump RTL * bump nbx * bump * New utxo-set for FastSync * Bump Monero to v0.17.2.3 (btcpayserver#522) Co-authored-by: Seth Simmons <[email protected]> Co-authored-by: Seth Simmons <[email protected]> Co-authored-by: Seth Simmons <[email protected]> * Bump NBX (btcpayserver#528) * Update FastSync sig for 699714 and testnet (btcpayserver#532) * Update signature for fastsync (btcpayserver#526) * Provide plugin directory for Clightning (btcpayserver#518) * Make btcpay-restart properly restart everything (Fix btcpayserver#524) * Update nbx * Update bitcoin-clightning.yml * Bumping RTL to 0.11.2 due to bug with peering (btcpayserver#523) * Script fix (btcpayserver#520) * Feat/fireflyiii (btcpayserver#344) * Adding Firefly-iii opt fragment * Adding environment variable to force creation of db * Instructing postgres to create database * Switching exposing default port, running create db command * Remove grep command for postgres container * Removing database creation on postgres container start * Adding required App Key env variable * Updating nginx rewriting * Updating firefly nginx confugration traying to make it work with subdirectory firefly-iii/firefly-iii#2848 (comment) * Trying to rewrite * Reconfiguring nginx to pass headers * Updating docker fragment * Last try * Allowing firefly iii to be hosted on other domain * Fixing docker compose env variables * Exposing ports for external communication * Ports exposing * Updating firefly host reference * Matching service name and VIRTUAL_HOST_NAME * Getting nginx to redirect to port 8080 * update and adapt * Adapt firefly to be with dedicated domain * Adapt Docker file builder to support non github builds * Make firefly init create db only if not exists + run full recommended upgrade procedure Co-authored-by: rockstardev <[email protected]> * Update dogecoin.yml (btcpayserver#533) * Set Default ACME production * Update Lightning-Rest * bump btcpay * Revert "Provide plugin directory for Clightning" (btcpayserver#535) * Bump Bitcoin core * Add joinmarket support * Activate gzip * Upgrade postgres * Fix firefly link * Fix instructions link for docs * Fix video link and preview image for docs * Markdown formatting * Revert "Upgrade postgres" This reverts commit 9741499. * Revert "Revert "Upgrade postgres"" This reverts commit d321c09. * Warning * Use supervisord for joinmarket * Fix jm.sh doc * Fix doc * Fix doc * Handle postgres migration for old install * Do not parse settings.json * Fix postgres update for arm32 * Fix postgres update for arm7 * Add documentation if postgres update fail on rapsberry pi 4 * Update woocommerce * Bump Tor Relay to latest stable release (4.5.9) * Add joinmarket for arm64 and arm32 * Improve NDLC disclaimer (btcpayserver#538) * Add chatwoot support system (btcpayserver#353) Co-authored-by: Andrew Camilleri <[email protected]> * Bump transmuter * Revert "Bump transmuter" This reverts commit 8280398. * bump bitcoin core 22.0, fix issue about corrupt settings.json * Revert "bump bitcoin core 22.0, fix issue about corrupt settings.json" This reverts commit a092054. * Revert "Revert "bump bitcoin core 22.0, fix issue about corrupt settings.json"" This reverts commit dcf0e55. * Remove bitcoin taproot cc * Bump NBX * Bump joinmarket to fix receive-payjoin * Bump joinmarket to fix receive-payjoin * Upgrade Tallycoin Connect (btcpayserver#541) Now it also supports arm32v7 and arm64v8 architectures. * update doc * Bump LND to v0.13.3-beta (btcpayserver#540) * Switch to our own postgres container * Update jm * update postgres * bump postgres * bump postgres * bump nbxplorer * bump * Make sure only one lightning implementation is selected * bump btcpay * Bump ThunderHub version (btcpayserver#547) * Upgrade Tallycoin Connect (btcpayserver#541) * Upgrade Tallycoin Connect Now it also supports arm32v7 and arm64v8 architectures. * Correct Dockerfile repo * Add images to Docker file builder helper * Fix GitHub link * Automatically update libseccomp2 on rapsberry pi 4 * Bump BTCPay * bump BTCPay * Update opt-add-btctransmuter.yml * Update libseccomp2 on any arm32 buster hosts * bump btcpay * update NBXplorer * bump btcpay * bump LND and BTCPay * bump lnd * bump clightning * bump woocommerce * Add Lightning Terminal fragment (btcpayserver#512) * Add Lightning Terminal fragment * Remove mappings and variables * Version update * Update contrib/build-all-images.sh Co-authored-by: Oliver Gugger <[email protected]> * Update docker version * Add Lightning Terminal to fragments list * Upgrade LiT to v0.6.0 Co-authored-by: Oliver Gugger <[email protected]> * Update Litecoin * fix litecoin * Update EPS * Bump monacoin to 0.20.2 (btcpayserver#563) * Update Lightning Terminal (btcpayserver#562) Co-authored-by: Andrew Camilleri <[email protected]> * bump btcpay * bump liquid Co-authored-by: Mike Olthoff <[email protected]> Co-authored-by: Anthony Potdevin <[email protected]> Co-authored-by: nicolas.dorier <[email protected]> Co-authored-by: gruve-p <[email protected]> Co-authored-by: Dali <[email protected]> Co-authored-by: dalijolijo <[email protected]> Co-authored-by: Andrew Camilleri <[email protected]> Co-authored-by: Dennis Reimann <[email protected]> Co-authored-by: Patrick <[email protected]> Co-authored-by: britttttk <[email protected]> Co-authored-by: Richard Safier <[email protected]> Co-authored-by: rockstardev <[email protected]> Co-authored-by: Kukks <[email protected]> Co-authored-by: strophy <[email protected]> Co-authored-by: Seth Simmons <[email protected]> Co-authored-by: Seth Simmons <[email protected]> Co-authored-by: Seth Simmons <[email protected]> Co-authored-by: Seth Simmons <[email protected]> Co-authored-by: Jonathan Underwood <[email protected]> Co-authored-by: Downet <[email protected]> Co-authored-by: rockstardev <[email protected]> Co-authored-by: Mike Olthoff <[email protected]> Co-authored-by: Pavlenex <[email protected]> Co-authored-by: xpayserver <[email protected]> Co-authored-by: Oliver Gugger <[email protected]> Co-authored-by: Jin Eguchi <[email protected]>
nestpay · Dec 20, 2021 · 18bb402 · 18bb402
1 parent 3bdf066
commit 18bb402
Show file tree

Hide file tree

Showing 60 changed files with 1,246 additions and 340 deletions.
diff --git a/.gitignore b/.gitignore
@@ -299,6 +299,7 @@ Production/.env
 
 Generated/acme.json
 Generated/traefik_logs/
+Generated/chatwoot_config.env
 Generated/error
 
 

diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
@@ -1,4 +1,4 @@
-{{ $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 */}}
@@ -18,7 +18,7 @@
 	server 127.0.0.1 down;
 		{{ end }}
 	{{ end }}
-	
+
 {{ end }}
 
 {{ define "redirects" }}
@@ -42,6 +42,13 @@
 		proxy_pass http://bitcoin_rtl:3000/rtl/;
 	}
 		{{ end }}
+
+		{{ if (eq $serviceName "joinmarket") }}
+		location /obwatch/ {
+		proxy_pass http://joinmarket:62601/;
+		}
+		{{ end }}
+
 		{{ if (eq $serviceName "bitcoin_thub") }}
 	location /thub {
 		proxy_pass http://bitcoin_thub:3000/thub;
@@ -65,7 +72,7 @@
 	location /lightning-charge/btc/ {
 		proxy_pass http://clightning_bitcoin_charge:9112/;
 	}
-	{{ end }}		
+	{{ end }}
 	{{ if (eq $serviceName "clightning_bitcoin_rest") }}
 	location /clightning-rest/btc/ {
 	    rewrite ^/clightning-rest/btc/(.*) /$1 break;
@@ -82,7 +89,7 @@
 		proxy_pass http://clightning_groestlcoin_charge:9112/;
 	}
 		{{ end }}
-		
+
 		{{ if (eq $serviceName "btctransmuter") }}
 	location /btctransmuter/ {
 		proxy_set_header Connection "";
@@ -106,7 +113,28 @@
 	}
 		{{ end }}
 
-
+  {{ if (eq $serviceName "lnd_lit") }}
+  location /lit {
+    proxy_set_header Host               $host;
+    proxy_set_header X-Real-IP          $remote_addr;
+    proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto  $scheme;
+    proxy_pass http://lnd_lit:8080/;
+  }
+
+	location ~* ^/lnrpc.Lightning/ {
+    proxy_pass http://lnd_lit:8080;
+  }
+
+  location ~* ^/looprpc.SwapClient/ {
+    proxy_pass http://lnd_lit:8080;
+  }
+
+  location ~* ^/poolrpc.Trader/ {
+    proxy_pass http://lnd_lit:8080;
+  }
+  {{ end }}
+
   {{ if (eq $serviceName "sphinxrelay") }}
   location /sphinxrelay/ {
     proxy_set_header        Host               $host;
@@ -115,6 +143,16 @@
     proxy_set_header        X-Forwarded-Proto  $scheme;
     proxy_pass http://sphinxrelay:3300/;
   }
+  {{ end }}
+
+  {{ if (eq $serviceName "tallycoin_connect") }}
+  location /tallycoin-connect/ {
+    proxy_set_header        Host               $host;
+    proxy_set_header        X-Real-IP          $remote_addr;
+    proxy_set_header        X-Forwarded-For    $proxy_add_x_forwarded_for;
+    proxy_set_header        X-Forwarded-Proto  $scheme;
+    proxy_pass http://tallycoin_connect:8123/;
+  }
   {{ end }}
 
 		{{ if (eq $serviceName "configurator") }}
@@ -187,7 +225,9 @@ map $scheme $proxy_x_forwarded_ssl {
   https on;
 }
 
-gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+gzip on;
+gzip_min_length 1000;
+gzip_types image/svg+xml text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
 
 log_format vhost '$host $remote_addr - $remote_user [$time_local] '
                  '"$request" $status $body_bytes_sent '

diff --git a/Production/postgres/migrate-docker-entrypoint.sh b/Production/postgres/migrate-docker-entrypoint.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+set -Eeo pipefail
+shopt -s extglob
+
+CURRENT_PGVERSION=""
+EXPECTED_PGVERSION="$PG_MAJOR"
+if [[ -f "/var/lib/postgresql/data/PG_VERSION" ]]; then
+    CURRENT_PGVERSION="$(cat /var/lib/postgresql/data/PG_VERSION)"
+fi
+
+if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \
+   [[ "$CURRENT_PGVERSION" != "" ]]; then
+   sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list
+   if ! apt-get update; then
+    echo "apt-get update failed. Are you using raspberry pi 4? If yes, please follow https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/"
+    exit 1
+   fi
+   if ! apt-get install -y --no-install-recommends \
+        postgresql-$CURRENT_PGVERSION \
+        postgresql-contrib-$CURRENT_PGVERSION; then
+        # On arm32, postgres doesn't ship those packages, so we download
+        # the binaries from an archive we built from the postgres 9.6.20 image's binaries
+        FALLBACK="https://aois.blob.core.windows.net/public/$CURRENT_PGVERSION-$(uname -m).tar.gz"
+        FALLBACK_SHARE="https://aois.blob.core.windows.net/public/share-$CURRENT_PGVERSION-$(uname -m).tar.gz"
+        echo "Failure to install postgresql-$CURRENT_PGVERSION and postgresql-contrib-$CURRENT_PGVERSION trying fallback $FALLBACK"
+        apt-get install -y wget
+        pushd . > /dev/null
+        cd /usr/lib/postgresql
+        wget $FALLBACK
+        tar -xvf *.tar.gz
+        rm -f *.tar.gz
+        cd /usr/share/postgresql
+        wget $FALLBACK_SHARE
+        tar -xvf *.tar.gz
+        rm -f *.tar.gz
+        popd > /dev/null
+        echo "Successfully installed PG utilities via the fallback"
+   fi
+
+    export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin"
+    export PGDATABASE="/var/lib/postgresql/data"
+    export PGDATAOLD="/var/lib/postgresql/data/$CURRENT_PGVERSION"
+    export PGDATANEW="/var/lib/postgresql/data/$EXPECTED_PGVERSION"
+
+    mkdir -p "$PGDATANEW" "$PGDATAOLD"
+    find "$PGDATABASE" -maxdepth 1 -mindepth 1 \
+                      -not -wholename "$PGDATAOLD" \
+                      -not -wholename "$PGDATANEW" \
+                      -exec mv {} "$PGDATAOLD/" \;
+
+    chmod 700 "$PGDATAOLD" "$PGDATANEW"
+    chown postgres .
+	chown -R postgres "$PGDATAOLD" "$PGDATANEW" "$PGDATABASE"
+	if [ ! -s "$PGDATANEW/PG_VERSION" ]; then
+		PGDATA="$PGDATANEW" eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
+	fi
+
+    gosu postgres pg_upgrade
+    rm $PGDATANEW/*.conf
+    mv $PGDATANEW/* "$PGDATABASE"
+    mv $PGDATAOLD/*.conf "$PGDATABASE"
+    rm -r "$PGDATANEW"
+    ./delete_old_cluster.sh
+    rm ./analyze_new_cluster.sh
+fi
+
+if [ -f "docker-entrypoint.sh" ]; then
+    exec ./docker-entrypoint.sh  "$@"
+else
+    exec docker-entrypoint.sh  "$@"
+fi