diff --git a/configure-box.sh b/configure-box.sh index 44095df..f7d88f8 100755 --- a/configure-box.sh +++ b/configure-box.sh @@ -23,8 +23,6 @@ cd .. echo "Installing RPCAuth into bitcoin.conf" cat secrets/rpcauth.txt >> bitcoin/bitcoin.conf RPCPASS=`cat secrets/rpcpass.txt` -echo "Configuring invoicer rpc info" -sed -i "s/RPCPASS/${RPCPASS}/g; " invoicer/invoicer.conf echo "Configuring LND rpc info" sed -i "s/RPCPASS/${RPCPASS}/g; " lnd/lnd.conf if [ ! -z $TESTNET ]; then diff --git a/docker-compose.yml b/docker-compose.yml index a9bcde1..0179bde 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,15 +40,21 @@ services: depends_on: [ bitcoin, web ] network_mode: host stop_grace_period: 1m30s - invoicer: - image: "lncm/invoicer:v0.6.6" + middleware: + image: getumbrel/middleware:v0.0.2 depends_on: [ bitcoin, lnd ] + logging: *default-logging restart: on-failure network_mode: host volumes: - - "${HOME}/invoicer:/root/.lncm" - - "${HOME}/invoicer:/lncm" - - "${HOME}/lnd:/lnd" + - "${HOME}/lnd:/lnd" + environment: + BITCOIN_NETWORK: "mainnet" + BITCOIN_HOST: "0.0.0.0" + RPC_USER: "" + RPC_PASSWORD: "" + LND_NETWORK: "mainnet" + LND_HOST: "127.0.0.1" lnd-unlock: build: ${HOME}/build/lnd-unlock/ depends_on: [ lnd ] diff --git a/invoicer/invoicer.conf b/invoicer/invoicer.conf deleted file mode 100644 index b5fbfae..0000000 --- a/invoicer/invoicer.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Note: all values used in this file are defaults that are used if nothing is provided - -port = 8181 -static-dir = "/lncm/www/" -log-file = "/lncm/invoicer.log" -ln-client = "lnd" - -off-chain-only = false - -[bitcoind] -host = "localhost" -port = 8332 -user = "lncm" -pass = "RPCPASS" - -[lnd] -host = "localhost" -port = 10009 -tls = "/lnd/tls.cert" -kill-count = 4 - -[lnd.macaroon] -invoice = "/lnd/data/chain/bitcoin/mainnet/invoice.macaroon" -readonly = "/lnd/data/chain/bitcoin/mainnet/readonly.macaroon" - - -[users] -# username = "password" - diff --git a/invoicer/www/.gitkeep b/invoicer/www/.gitkeep deleted file mode 100644 index e69de29..0000000