Remove old code

Production/docker-compose.btc-ltc-clightning.yml

@@ -1,206 +0,0 @@
-# DO NOT USE THOSE ARE DEPRECATED
-services:
-  nginx:
-    restart: unless-stopped
-    image: nginx:stable
-    container_name: nginx
-    ports:
-    - "80:80"
-    - "443:443"
-    volumes:
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:ro"
-    links:
-    - btcpayserver
-  nginx-gen:
-    restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.5
-    container_name: nginx-gen
-    volumes:
-    - "/var/run/docker.sock:/tmp/docker.sock:ro"
-    - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro"
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:ro"
-    entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    links:
-    - nginx
-  letsencrypt-nginx-proxy-companion:
-    restart: unless-stopped
-    image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: letsencrypt-nginx-proxy-companion
-    volumes:
-    - "/var/run/docker.sock:/var/run/docker.sock:ro"
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:rw"
-    environment:
-      NGINX_DOCKER_GEN_CONTAINER: "nginx-gen"
-      NGINX_PROXY_CONTAINER: "nginx"
-      ACME_CA_URI: ${ACME_CA_URI:-staging}
-    links:
-    - nginx-gen
-  btcpayserver:
-    restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.106
-    expose:
-    - "49392"
-    environment:
-      BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest}
-      BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      BTCPAY_BIND: 0.0.0.0:49392
-      BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/
-      BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/}
-      BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS}
-      BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE}
-      VIRTUAL_NETWORK: nginx-proxy
-      VIRTUAL_PORT: 49392
-      VIRTUAL_HOST: ${BTCPAY_HOST}
-      VIRTUAL_HOST_NAME: "btcpay"
-      SSL_POLICY: Mozilla-Modern
-      LETSENCRYPT_HOST: ${BTCPAY_HOST}
-      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-<no value>}
-      BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/
-      BTCPAY_CHAINS: "ltc,btc"
-      BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc"
-      BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/
-      BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc"
-    links:
-    - nbxplorer
-    - postgres
-    - clightning_litecoin
-    - clightning_bitcoin
-    volumes:
-    - "btcpay_datadir:/datadir"
-    - "nbxplorer_datadir:/root/.nbxplorer"
-    - "clightning_litecoin_datadir:/etc/clightning_litecoin"
-    - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
-  nbxplorer:
-    restart: unless-stopped
-    image: nicolasdorier/nbxplorer:1.0.2.31
-    expose:
-    - "32838"
-    environment:
-      NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      NBXPLORER_BIND: 0.0.0.0:32838
-      NBXPLORER_CHAINS: "ltc,btc"
-      NBXPLORER_LTCRPCURL: http://litecoind:43782/
-      NBXPLORER_LTCNODEENDPOINT: litecoind:39388
-      NBXPLORER_BTCRPCURL: http://bitcoind:43782/
-      NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
-    volumes:
-    - "nbxplorer_datadir:/datadir"
-    - "litecoin_datadir:/root/.litecoin"
-    - "bitcoin_datadir:/root/.bitcoin"
-    links:
-    - litecoind
-    - bitcoind
-  postgres:
-    restart: unless-stopped
-    image: postgres:9.6.5
-    volumes:
-    - "postgres_datadir:/var/lib/postgresql/data"
-  litecoind:
-    restart: unless-stopped
-    container_name: btcpayserver_litecoind
-    image: nicolasdorier/docker-litecoin:0.16.3
-    environment:
-      BITCOIN_EXTRA_ARGS: |
-        rpcport=43782
-        ${NBITCOIN_NETWORK:-regtest}=1
-        port=39388
-        zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtx=tcp://0.0.0.0:28333
-        whitelist=0.0.0.0/0
-    expose:
-    - "43782"
-    - "39388"
-    - "28332"
-    - "28333"
-    volumes:
-    - "litecoin_datadir:/data"
-  clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6.1
-    container_name: btcpayserver_clightning_litecoin
-    restart: unless-stopped
-    environment:
-      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      LIGHTNINGD_CHAIN: ltc
-      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
-      LIGHTNINGD_OPT: |
-        bitcoin-datadir=/etc/litecoin
-        bitcoin-rpcconnect=litecoind
-        bind-addr=0.0.0.0:9735
-        announce-addr=${BTCPAY_HOST}:9736
-        network=${NBITCOIN_NETWORK:-regtest}
-        alias=${LIGHTNING_ALIAS}
-        chain=ltc
-    volumes:
-    - "clightning_litecoin_datadir:/root/.lightning"
-    - "litecoin_datadir:/etc/litecoin"
-    - "nbxplorer_datadir:/root/.nbxplorer"
-    ports:
-    - "9736:9735"
-    links:
-    - nbxplorer
-    - litecoind
-  bitcoind:
-    restart: unless-stopped
-    container_name: btcpayserver_bitcoind
-    image: nicolasdorier/docker-bitcoin:0.16.3
-    environment:
-      BITCOIN_EXTRA_ARGS: |
-        rpcport=43782
-        ${NBITCOIN_NETWORK:-regtest}=1
-        port=39388
-        whitelist=0.0.0.0/0
-        zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtx=tcp://0.0.0.0:28333
-    expose:
-    - "43782"
-    - "39388"
-    - "28332"
-    - "28333"
-    volumes:
-    - "bitcoin_datadir:/data"
-  clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6.1
-    container_name: btcpayserver_clightning_bitcoin
-    restart: unless-stopped
-    environment:
-      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      LIGHTNINGD_CHAIN: btc
-      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
-      LIGHTNINGD_OPT: |
-        bitcoin-datadir=/etc/bitcoin
-        bitcoin-rpcconnect=bitcoind
-        announce-addr=${BTCPAY_HOST}:9735
-        bind-addr=0.0.0.0:9735
-        network=${NBITCOIN_NETWORK:-regtest}
-        alias=${LIGHTNING_ALIAS}
-        chain=btc
-    volumes:
-    - "clightning_bitcoin_datadir:/root/.lightning"
-    - "bitcoin_datadir:/etc/bitcoin"
-    - "nbxplorer_datadir:/root/.nbxplorer"
-    ports:
-    - "9735:9735"
-    links:
-    - nbxplorer
-    - bitcoind
-volumes:
-  nginx_conf: 
-  nginx_vhost: 
-  nginx_html: 
-  nginx_certs: 
-  postgres_datadir: 
-  btcpay_datadir: 
-  nbxplorer_datadir: 
-  litecoin_datadir: 
-  clightning_litecoin_datadir: 
-  bitcoin_datadir: 
-  clightning_bitcoin_datadir: 

Production/docker-compose.btc-ltc.yml

@@ -1,148 +0,0 @@
-# DO NOT USE THOSE ARE DEPRECATED
-services:
-  nginx:
-    restart: unless-stopped
-    image: nginx:stable
-    container_name: nginx
-    ports:
-    - "80:80"
-    - "443:443"
-    volumes:
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:ro"
-    links:
-    - btcpayserver
-  nginx-gen:
-    restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.5
-    container_name: nginx-gen
-    volumes:
-    - "/var/run/docker.sock:/tmp/docker.sock:ro"
-    - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro"
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:ro"
-    entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    links:
-    - nginx
-  letsencrypt-nginx-proxy-companion:
-    restart: unless-stopped
-    image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: letsencrypt-nginx-proxy-companion
-    volumes:
-    - "/var/run/docker.sock:/var/run/docker.sock:ro"
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:rw"
-    environment:
-      NGINX_DOCKER_GEN_CONTAINER: "nginx-gen"
-      NGINX_PROXY_CONTAINER: "nginx"
-      ACME_CA_URI: ${ACME_CA_URI:-staging}
-    links:
-    - nginx-gen
-  btcpayserver:
-    restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.106
-    expose:
-    - "49392"
-    environment:
-      BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest}
-      BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      BTCPAY_BIND: 0.0.0.0:49392
-      BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/
-      BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/}
-      BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS}
-      BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE}
-      VIRTUAL_NETWORK: nginx-proxy
-      VIRTUAL_PORT: 49392
-      VIRTUAL_HOST: ${BTCPAY_HOST}
-      VIRTUAL_HOST_NAME: "btcpay"
-      SSL_POLICY: Mozilla-Modern
-      LETSENCRYPT_HOST: ${BTCPAY_HOST}
-      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-<no value>}
-      BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/
-      BTCPAY_CHAINS: "ltc,btc"
-      BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/
-    links:
-    - nbxplorer
-    - postgres
-    volumes:
-    - "btcpay_datadir:/datadir"
-    - "nbxplorer_datadir:/root/.nbxplorer"
-  nbxplorer:
-    restart: unless-stopped
-    image: nicolasdorier/nbxplorer:1.0.2.31
-    expose:
-    - "32838"
-    environment:
-      NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      NBXPLORER_BIND: 0.0.0.0:32838
-      NBXPLORER_CHAINS: "ltc,btc"
-      NBXPLORER_LTCRPCURL: http://litecoind:43782/
-      NBXPLORER_LTCNODEENDPOINT: litecoind:39388
-      NBXPLORER_BTCRPCURL: http://bitcoind:43782/
-      NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
-    volumes:
-    - "nbxplorer_datadir:/datadir"
-    - "litecoin_datadir:/root/.litecoin"
-    - "bitcoin_datadir:/root/.bitcoin"
-    links:
-    - litecoind
-    - bitcoind
-  postgres:
-    restart: unless-stopped
-    image: postgres:9.6.5
-    volumes:
-    - "postgres_datadir:/var/lib/postgresql/data"
-  litecoind:
-    restart: unless-stopped
-    container_name: btcpayserver_litecoind
-    image: nicolasdorier/docker-litecoin:0.16.3
-    environment:
-      BITCOIN_EXTRA_ARGS: |
-        rpcport=43782
-        ${NBITCOIN_NETWORK:-regtest}=1
-        port=39388
-        zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtx=tcp://0.0.0.0:28333
-        whitelist=0.0.0.0/0
-    expose:
-    - "43782"
-    - "39388"
-    - "28332"
-    - "28333"
-    volumes:
-    - "litecoin_datadir:/data"
-  bitcoind:
-    restart: unless-stopped
-    container_name: btcpayserver_bitcoind
-    image: nicolasdorier/docker-bitcoin:0.16.3
-    environment:
-      BITCOIN_EXTRA_ARGS: |
-        rpcport=43782
-        ${NBITCOIN_NETWORK:-regtest}=1
-        port=39388
-        whitelist=0.0.0.0/0
-        zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtx=tcp://0.0.0.0:28333
-    expose:
-    - "43782"
-    - "39388"
-    - "28332"
-    - "28333"
-    volumes:
-    - "bitcoin_datadir:/data"
-volumes:
-  nginx_conf: 
-  nginx_vhost: 
-  nginx_html: 
-  nginx_certs: 
-  postgres_datadir: 
-  btcpay_datadir: 
-  nbxplorer_datadir: 
-  litecoin_datadir: 
-  bitcoin_datadir: 

Production/docker-compose.btc.yml

@@ -1,122 +0,0 @@
-services:
-  nginx:
-    restart: unless-stopped
-    image: nginx:stable
-    container_name: nginx
-    ports:
-    - "80:80"
-    - "443:443"
-    volumes:
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:ro"
-    links:
-    - btcpayserver
-  nginx-gen:
-    restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.5
-    container_name: nginx-gen
-    volumes:
-    - "/var/run/docker.sock:/tmp/docker.sock:ro"
-    - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro"
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:ro"
-    entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    links:
-    - nginx
-  letsencrypt-nginx-proxy-companion:
-    restart: unless-stopped
-    image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: letsencrypt-nginx-proxy-companion
-    volumes:
-    - "/var/run/docker.sock:/var/run/docker.sock:ro"
-    - "nginx_conf:/etc/nginx/conf.d"
-    - "nginx_vhost:/etc/nginx/vhost.d"
-    - "nginx_html:/usr/share/nginx/html"
-    - "nginx_certs:/etc/nginx/certs:rw"
-    environment:
-      NGINX_DOCKER_GEN_CONTAINER: "nginx-gen"
-      NGINX_PROXY_CONTAINER: "nginx"
-      ACME_CA_URI: ${ACME_CA_URI:-staging}
-    links:
-    - nginx-gen
-  btcpayserver:
-    restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.106
-    expose:
-    - "49392"
-    environment:
-      BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest}
-      BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      BTCPAY_BIND: 0.0.0.0:49392
-      BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/
-      BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/}
-      BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS}
-      BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE}
-      VIRTUAL_NETWORK: nginx-proxy
-      VIRTUAL_PORT: 49392
-      VIRTUAL_HOST: ${BTCPAY_HOST}
-      VIRTUAL_HOST_NAME: "btcpay"
-      SSL_POLICY: Mozilla-Modern
-      LETSENCRYPT_HOST: ${BTCPAY_HOST}
-      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-<no value>}
-      BTCPAY_CHAINS: "btc"
-      BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/
-    links:
-    - nbxplorer
-    - postgres
-    volumes:
-    - "btcpay_datadir:/datadir"
-    - "nbxplorer_datadir:/root/.nbxplorer"
-  nbxplorer:
-    restart: unless-stopped
-    image: nicolasdorier/nbxplorer:1.0.2.31
-    expose:
-    - "32838"
-    environment:
-      NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      NBXPLORER_BIND: 0.0.0.0:32838
-      NBXPLORER_CHAINS: "btc"
-      NBXPLORER_BTCRPCURL: http://bitcoind:43782/
-      NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
-    volumes:
-    - "nbxplorer_datadir:/datadir"
-    - "bitcoin_datadir:/root/.bitcoin"
-    links:
-    - bitcoind
-  postgres:
-    restart: unless-stopped
-    image: postgres:9.6.5
-    volumes:
-    - "postgres_datadir:/var/lib/postgresql/data"
-  bitcoind:
-    restart: unless-stopped
-    container_name: btcpayserver_bitcoind
-    image: nicolasdorier/docker-bitcoin:0.16.3
-    environment:
-      BITCOIN_EXTRA_ARGS: |
-        rpcport=43782
-        ${NBITCOIN_NETWORK:-regtest}=1
-        port=39388
-        whitelist=0.0.0.0/0
-        zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtx=tcp://0.0.0.0:28333
-    expose:
-    - "43782"
-    - "39388"
-    - "28332"
-    - "28333"
-    volumes:
-    - "bitcoin_datadir:/data"
-volumes:
-  nginx_conf: 
-  nginx_vhost: 
-  nginx_html: 
-  nginx_certs: 
-  postgres_datadir: 
-  btcpay_datadir: 
-  nbxplorer_datadir: 
-  bitcoin_datadir: 

README.md

@@ -261,7 +261,8 @@ Next, you will need to configure the runtime environment variables for `Generate
 `/etc/profile.d/btcpay-env.sh` ensures that your environment variables are correctly setup when you login, so you can use the tools:
 
 ```bash
-export BTCPAYGEN_OLD_PREGEN="false"
+#!/bin/bash
+export COMPOSE_HTTP_TIMEOUT="180"
 export BTCPAYGEN_CRYPTO1="btc"
 export BTCPAYGEN_CRYPTO2=""
 export BTCPAYGEN_CRYPTO3=""
@@ -271,15 +272,20 @@ export BTCPAYGEN_CRYPTO6=""
 export BTCPAYGEN_CRYPTO7=""
 export BTCPAYGEN_CRYPTO8=""
 export BTCPAYGEN_CRYPTO9=""
-export BTCPAYGEN_LIGHTNING="clightning"
+export BTCPAYGEN_LIGHTNING="lnd"
 export BTCPAYGEN_REVERSEPROXY="nginx"
-export BTCPAYGEN_ADDITIONAL_FRAGMENTS=""
+export BTCPAYGEN_ADDITIONAL_FRAGMENTS="opt-save-storage-s;opt-add-nolimits"
-export BTCPAY_DOCKER_COMPOSE="/var/lib/waagent/custom-script/download/0/btcpayserver-docker/Production/docker-compose.generated.yml"
+export BTCPAYGEN_EXCLUDE_FRAGMENTS=";bitcoin"
-export BTCPAY_BASE_DIRECTORY="/var/lib/waagent/custom-script/download/0"
+export BTCPAY_DOCKER_COMPOSE="/root/btcpayserver-docker/Generated/docker-compose.generated.yml"
-export BTCPAY_ENV_FILE="/var/lib/waagent/custom-script/download/0/.env"
+export BTCPAY_BASE_DIRECTORY="/root"
-export BTCPAY_HOST_SSHKEYFILE="/root/.ssh/id_rsa_btcpay"
+export BTCPAY_ENV_FILE="/root/.env"
-if cat $BTCPAY_ENV_FILE &> /dev/null; then
+export BTCPAY_HOST_SSHKEYFILE=""
-  export $(grep -v '^#' "$BTCPAY_ENV_FILE" | xargs)
+export BTCPAY_ENABLE_SSH=true
+export PIHOLE_SERVERIP=""
+if cat "$BTCPAY_ENV_FILE" &> /dev/null; then
+  while IFS= read -r line; do
+    ! [[ "$line" == "#"* ]] && [[ "$line" == *"="* ]] && export "$line"
+  done < "$BTCPAY_ENV_FILE"
 fi
 ```
 
@@ -430,41 +436,6 @@ export BTCPAYGEN_CRYPTO3='btg'
 . btcpay-setup.sh -i
 ```
 
-## I deployed before `btcpay-setup.sh` existed (before May 17, 2018), can I migrate to this new system?
-
-Yes, run the following commands to update:
-
-```bash
-sudo su -
-
-cd $DOWNLOAD_ROOT/btcpayserver-docker
-git checkout master
-git pull
-git checkout 9acb5d8067cb5c46f59858137feb699b41ac9f19
-btcpay-update.sh
-. ./btcpay-setup.sh -i
-git checkout master
-btcpay-update.sh
-
-exit
-```
-
-## I'm getting an error on Windows: `Cannot create container for service docker: Mount denied`?
-
-If you see this error:
-
-`Cannot create container for service docker: b'Mount denied:\nThe source path "\\\\var\\\\run\\\\docker.sock:/var/run/docker.sock"\nis not a valid Windows path'`.
-
-Run this in [powershell](https://docs.microsoft.com/en-us/powershell/scripting/windows-powershell/starting-windows-powershell):
-
-```powershell
-$Env:COMPOSE_CONVERT_WINDOWS_PATHS=1
-```
-
-Then, run `docker-compose -f EXAMPLE.yml up`.
-
-This bug comes from Docker for Windows and is [tracked on Github](https://github.com/docker/for-win/issues/1829).
-
 ## How I can prune my node(s)?
 
 This will prune your Bitcoin full node to a maximum of 100GB (of blocks):

btcpay-setup.sh

@@ -183,17 +183,10 @@ if [ ! -z "$BTCPAY_ADDITIONAL_HOSTS" ] && [[ "$BTCPAY_ADDITIONAL_HOSTS" == .onio
     echo "$BTCPAY_ADDITIONAL_HOSTS should not contain onion hosts, additional hosts is only for getting https certificates, those are not available to tor addresses"
     return;
 fi
-######### Migration: old pregen environment to new environment ############
-if [[ ! -z $BTCPAY_DOCKER_COMPOSE ]] && [[ ! -z $DOWNLOAD_ROOT ]] && [[ -z $BTCPAYGEN_OLD_PREGEN ]]; then
-    echo "Your deployment is too old, you need to migrate by following instructions on this link https://docs.btcpayserver.org/Docker/#i-deployed-before-btcpay-setup-sh-existed-before-may-17-2018-can-i-migrate-to-this-new-system"
-    return
-fi
-#########################################################
 
 [[ $LETSENCRYPT_EMAIL == *@example.com ]] && echo "LETSENCRYPT_EMAIL ends with @example.com, setting to empty email instead" && LETSENCRYPT_EMAIL=""
 
 : "${LETSENCRYPT_EMAIL:=}"
-: "${BTCPAYGEN_OLD_PREGEN:=false}"
 : "${NBITCOIN_NETWORK:=mainnet}"
 : "${BTCPAYGEN_CRYPTO1:=btc}"
 : "${BTCPAYGEN_REVERSEPROXY:=nginx}"
@@ -212,18 +205,7 @@ fi
 OLD_BTCPAY_DOCKER_COMPOSE="$BTCPAY_DOCKER_COMPOSE"
 ORIGINAL_DIRECTORY="$(pwd)"
 BTCPAY_BASE_DIRECTORY="$(dirname "$(pwd)")"
-
+BTCPAY_DOCKER_COMPOSE="$(pwd)/Generated/docker-compose.generated.yml"
-if [[ "$BTCPAYGEN_OLD_PREGEN" == "true" ]]; then
-    if [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production ]]; then
-        BTCPAY_DOCKER_COMPOSE="$(pwd)/Production/docker-compose.generated.yml"
-    elif [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production-NoReverseProxy ]]; then
-        BTCPAY_DOCKER_COMPOSE="$(pwd)/Production-NoReverseProxy/docker-compose.generated.yml"
-    else
-        BTCPAY_DOCKER_COMPOSE="$(pwd)/Production/docker-compose.generated.yml"
-    fi
-else # new deployments must be in Generated
-    BTCPAY_DOCKER_COMPOSE="$(pwd)/Generated/docker-compose.generated.yml"
-fi
 
 BTCPAY_ENV_FILE="$BTCPAY_BASE_DIRECTORY/.env"
 
@@ -324,7 +306,6 @@ Additional exported variables:
 BTCPAY_DOCKER_COMPOSE=$BTCPAY_DOCKER_COMPOSE
 BTCPAY_BASE_DIRECTORY=$BTCPAY_BASE_DIRECTORY
 BTCPAY_ENV_FILE=$BTCPAY_ENV_FILE
-BTCPAYGEN_OLD_PREGEN=$BTCPAYGEN_OLD_PREGEN
 BTCPAY_SSHKEYFILE=$BTCPAY_SSHKEYFILE
 BTCPAY_SSHAUTHORIZEDKEYS=$BTCPAY_SSHAUTHORIZEDKEYS
 BTCPAY_HOST_SSHAUTHORIZEDKEYS:$BTCPAY_HOST_SSHAUTHORIZEDKEYS
@@ -350,7 +331,6 @@ touch "$BASH_PROFILE_SCRIPT"
 echo "
 #!/bin/bash
 export COMPOSE_HTTP_TIMEOUT=\"180\"
-export BTCPAYGEN_OLD_PREGEN=\"$BTCPAYGEN_OLD_PREGEN\"
 export BTCPAYGEN_CRYPTO1=\"$BTCPAYGEN_CRYPTO1\"
 export BTCPAYGEN_CRYPTO2=\"$BTCPAYGEN_CRYPTO2\"
 export BTCPAYGEN_CRYPTO3=\"$BTCPAYGEN_CRYPTO3\"
@@ -452,10 +432,6 @@ if $HAS_DOCKER; then
     fi
 fi
 
-if [[ "$BTCPAYGEN_OLD_PREGEN" == "true" ]]; then
-    cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE
-fi
-
 # Schedule for reboot
 if $STARTUP_REGISTER && [[ -x "$(command -v systemctl)" ]]; then
     # Use systemd

btcpay-update.sh

@@ -13,16 +13,6 @@ fi
 
 . ${BASH_PROFILE_SCRIPT}
 
-if [ ! -z $BTCPAY_DOCKER_COMPOSE ] && [ ! -z $DOWNLOAD_ROOT ] && [ -z $BTCPAYGEN_OLD_PREGEN ]; then 
-    echo "Your deployment is too old, you need to migrate by following instructions on this link https://github.com/btcpayserver/btcpayserver-docker/tree/master#i-deployed-before-btcpay-setupsh-existed-before-may-17-can-i-migrate-to-this-new-system"
-    exit
-fi
-
-if [[ $BTCPAY_DOCKER_COMPOSE != *docker-compose.generated.yml ]]; then
-    echo "Your deployment is too old, you need to migrate by following instructions on this link https://github.com/btcpayserver/btcpayserver-docker/tree/master#i-deployed-before-btcpay-setupsh-existed-before-may-17-can-i-migrate-to-this-new-system"
-    exit
-fi
-
 cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
 
 if [[ "$1" != "--skip-git-pull" ]]; then
@@ -47,11 +37,6 @@ if ! ./build.sh; then
     exit 1
 fi
 
-if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then
-    cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE
-    cp Generated/torrc.tmpl "$(dirname "$BTCPAY_DOCKER_COMPOSE")/torrc.tmpl"
-fi
-
 if ! grep -Fxq "export COMPOSE_HTTP_TIMEOUT=\"180\"" "$BASH_PROFILE_SCRIPT"; then
     echo "export COMPOSE_HTTP_TIMEOUT=\"180\"" >> "$BASH_PROFILE_SCRIPT"
     export COMPOSE_HTTP_TIMEOUT=180