From 69c1110a9d4636012966ab8f5618babab73fc498 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 19 Jun 2018 02:38:12 +0900 Subject: [PATCH] Allow unset letsencrypt email --- Production-NoReverseProxy/docker-compose.btc-clightning.yml | 2 +- .../docker-compose.btc-ltc-clightning.yml | 2 +- Production-NoReverseProxy/docker-compose.btc-ltc.yml | 2 +- Production-NoReverseProxy/docker-compose.btc.yml | 2 +- Production-NoReverseProxy/docker-compose.ltc-clightning.yml | 2 +- Production-NoReverseProxy/docker-compose.ltc.yml | 2 +- Production/docker-compose.btc-clightning.yml | 2 +- Production/docker-compose.btc-ltc-clightning.yml | 2 +- Production/docker-compose.btc-ltc.yml | 2 +- Production/docker-compose.btc.yml | 2 +- Production/docker-compose.ltc-clightning.yml | 2 +- Production/docker-compose.ltc.yml | 2 +- btcpay-setup.sh | 6 ++++-- docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +- 14 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml index 4c571eb..ecf8b3b 100644 --- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml +++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml @@ -16,7 +16,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_CHAINS: "btc" BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_BTCLIGHTNING: "/etc/clightning_bitcoin/lightning-rpc" diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml index f382480..5471b84 100644 --- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml +++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml @@ -16,7 +16,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc,btc" BTCPAY_LTCLIGHTNING: "/etc/clightning_litecoin/lightning-rpc" diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc.yml b/Production-NoReverseProxy/docker-compose.btc-ltc.yml index 6ce0d7f..4e12aa4 100644 --- a/Production-NoReverseProxy/docker-compose.btc-ltc.yml +++ b/Production-NoReverseProxy/docker-compose.btc-ltc.yml @@ -16,7 +16,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc,btc" BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml index 5aa3f91..daa2a15 100644 --- a/Production-NoReverseProxy/docker-compose.btc.yml +++ b/Production-NoReverseProxy/docker-compose.btc.yml @@ -16,7 +16,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_CHAINS: "btc" BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ links: diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml index d871319..29a5150 100644 --- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml +++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml @@ -16,7 +16,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc" BTCPAY_LTCLIGHTNING: "/etc/clightning_litecoin/lightning-rpc" diff --git a/Production-NoReverseProxy/docker-compose.ltc.yml b/Production-NoReverseProxy/docker-compose.ltc.yml index e3fbe32..d1f4b2d 100644 --- a/Production-NoReverseProxy/docker-compose.ltc.yml +++ b/Production-NoReverseProxy/docker-compose.ltc.yml @@ -16,7 +16,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc" links: diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml index 1dbf115..03665cc 100644 --- a/Production/docker-compose.btc-clightning.yml +++ b/Production/docker-compose.btc-clightning.yml @@ -60,7 +60,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_CHAINS: "btc" BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_BTCLIGHTNING: "/etc/clightning_bitcoin/lightning-rpc" diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml index 9bc4c56..3894086 100644 --- a/Production/docker-compose.btc-ltc-clightning.yml +++ b/Production/docker-compose.btc-ltc-clightning.yml @@ -60,7 +60,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc,btc" BTCPAY_LTCLIGHTNING: "/etc/clightning_litecoin/lightning-rpc" diff --git a/Production/docker-compose.btc-ltc.yml b/Production/docker-compose.btc-ltc.yml index 5bf6cce..b77dbbf 100644 --- a/Production/docker-compose.btc-ltc.yml +++ b/Production/docker-compose.btc-ltc.yml @@ -60,7 +60,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc,btc" BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml index a129dae..0fd6948 100644 --- a/Production/docker-compose.btc.yml +++ b/Production/docker-compose.btc.yml @@ -60,7 +60,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_CHAINS: "btc" BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ links: diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml index cb6533d..ab6e416 100644 --- a/Production/docker-compose.ltc-clightning.yml +++ b/Production/docker-compose.ltc-clightning.yml @@ -60,7 +60,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc" BTCPAY_LTCLIGHTNING: "/etc/clightning_litecoin/lightning-rpc" diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml index 402601f..2eb8daf 100644 --- a/Production/docker-compose.ltc.yml +++ b/Production/docker-compose.ltc.yml @@ -60,7 +60,7 @@ services: VIRTUAL_HOST: ${BTCPAY_HOST} SSL_POLICY: Mozilla-Modern LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ BTCPAY_CHAINS: "ltc" links: diff --git a/btcpay-setup.sh b/btcpay-setup.sh index f3fc5e9..7051bae 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -49,7 +49,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) - LETSENCRYPT_EMAIL: A mail will be sent to this address if certificate expires and fail to renew automatically (eg. me@example.com, Default:me@example.com) + 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 BTCPAYGEN_CRYPTO1: First supported crypto currency (eg. btc, ltc, none. Default: btc) @@ -119,7 +119,9 @@ if [ ! -z $BTCPAY_DOCKER_COMPOSE ] && [ ! -z $DOWNLOAD_ROOT ] && [ -z $BTCPAYGEN fi ######################################################### -: "${LETSENCRYPT_EMAIL:=me@example.com}" +[[ $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}" diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 16039b4..4320e9e 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -23,7 +23,7 @@ services: # Let's encrypt settings LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-yourname@example.com} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} links: - nbxplorer