From 37f34d1afa120c4da93399867697f729b16ccebb Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 12 Jun 2019 15:22:56 +0900 Subject: [PATCH 1/2] Add REVERSEPROXY_DEFAULT_HOST --- README.md | 1 + btcpay-setup.sh | 1 + docker-compose-generator/docker-fragments/nginx.yml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 772f6dd..1f9630d 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ You can read [the article](https://medium.com/@BtcpayServer/hosting-btcpay-serve `btcpay-setup.sh` will use the following environment variables: * `BTCPAY_HOST`: The hostname of your website (eg. `btcpay.example.com`) +* `REVERSEPROXY_DEFAULT_HOST`: Optional, if using a reverse proxy nginx, specify which website should be presented if the server is accessed by its IP. * `NBITCOIN_NETWORK`: The type of network to use (eg. `mainnet`, `testnet`, or `regtest`. Default: `mainnet`) * `LIGHTNING_ALIAS`: An alias for your lightning network node, if used * `BTCPAYGEN_CRYPTO1`: First supported crypto currency (eg. `btc`, `ltc`. Default: `btc`) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index f99cb73..c5b7fe1 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -50,6 +50,7 @@ This will be used to properly setup HTTPS via let's encrypt. Environment variables: BTCPAY_HOST: The hostname of your website (eg. btcpay.example.com) + REVERSEPROXY_DEFAULT_HOST: Optional, if using a reverse proxy nginx, specify which website should be presented if the server is accessed by its IP. LETSENCRYPT_EMAIL: A mail will be sent to this address if certificate expires and fail to renew automatically (eg. me@example.com) NBITCOIN_NETWORK: The type of network to use (eg. mainnet, testnet or regtest. Default: mainnet) LIGHTNING_ALIAS: An alias for your lightning network node if used diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index 35e87fd..5c273d6 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -17,6 +17,8 @@ services: restart: unless-stopped image: btcpayserver/docker-gen:0.7.5 container_name: nginx-gen + environment: + DEFAULT_HOST: ${REVERSEPROXY_DEFAULT_HOST:-none} volumes: - "/var/run/docker.sock:/tmp/docker.sock:ro" - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" From 2924514335da8a6ccb1203a4ac303d1027cb3020 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 12 Jun 2019 15:54:39 +0900 Subject: [PATCH 2/2] Save REVERSEPROXY_DEFAULT_HOST= --- btcpay-setup.sh | 2 ++ helpers.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index c5b7fe1..1b44966 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -107,6 +107,7 @@ fi : "${BTCPAYGEN_CRYPTO1:=btc}" : "${BTCPAYGEN_REVERSEPROXY:=nginx}" : "${BTCPAYGEN_LIGHTNING:=none}" +: "${REVERSEPROXY_DEFAULT_HOST:=none}" : "${ACME_CA_URI:=https://acme-v01.api.letsencrypt.org/directory}" : "${BTCPAY_PROTOCOL:=https}" @@ -158,6 +159,7 @@ echo " Parameters passed: BTCPAY_PROTOCOL:$BTCPAY_PROTOCOL BTCPAY_HOST:$BTCPAY_HOST +REVERSEPROXY_DEFAULT_HOST:$REVERSEPROXY_DEFAULT_HOST LIBREPATRON_HOST:$LIBREPATRON_HOST WOOCOMMERCE_HOST:$WOOCOMMERCE_HOST BTCTRANSMUTER_HOST:$BTCTRANSMUTER_HOST diff --git a/helpers.sh b/helpers.sh index 86baad6..80f3c22 100755 --- a/helpers.sh +++ b/helpers.sh @@ -71,6 +71,7 @@ echo " BTCPAY_PROTOCOL=$BTCPAY_PROTOCOL BTCPAY_HOST=$BTCPAY_HOST BTCPAY_ANNOUNCEABLE_HOST=$BTCPAY_ANNOUNCEABLE_HOST +REVERSEPROXY_DEFAULT_HOST=$REVERSEPROXY_DEFAULT_HOST BTCPAY_IMAGE=$BTCPAY_IMAGE ACME_CA_URI=$ACME_CA_URI NBITCOIN_NETWORK=$NBITCOIN_NETWORK