Merge branch 'master' of github.com:getumbrel/umbrel-compose into partition-util

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

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.5
                 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_HOST: "0.0.0.0"
+                    RPC_PORT: "8332"
+                    RPC_USER: ""
+                    RPC_PASSWORD: ""
+                    LND_NETWORK: "mainnet"
+                    LND_HOST: "127.0.0.1"
         lnd-unlock:
                 build: ${HOME}/build/lnd-unlock/
                 depends_on: [ lnd ]

install-box.sh

@@ -13,7 +13,7 @@
 
 echo "Cloning to current working directory from github..."
 git init
-git remote add origin https://github.com/lncm/thebox-compose-system.git
+git remote add origin https://github.com/getumbrel/umbrel-compose.git
 git fetch
 git reset origin/master
 git checkout -t origin/master

invoicer/invoicer.conf

@@ -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"
-

lnd/lnd.conf

@@ -5,8 +5,10 @@ rpclisten=0.0.0.0:10009
 restlisten=0.0.0.0:8080
 maxpendingchannels=3
 minchansize=10000
-alias=LNCM Default Box
-color=#ffe200
+; This should be re-written via script
+alias=My Umbrel Node
+; This should also be re-written by script
+color=#5351FB
 ; 0.9.X keysend functionality
 accept-keysend=true
 
@@ -30,7 +32,7 @@ bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333
 bitcoin.active=1
 bitcoin.mainnet=1
 ; Use neutrino for now, but maybe it could be permanent and then switch
-; to a full node once its working?
+; to a full node if theres enough space
 bitcoin.node=neutrino
 bitcoin.defaultchanconfs=2
 

nginx/conf.d/default.conf

@@ -10,8 +10,8 @@ server {
         try_files $uri $uri/ /index.html;	
     }
 
-    location  /invoicer/ {
+    location  /api/ {
         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        proxy_pass http://localhost:8181/api/;
+        proxy_pass http://localhost:3005/;
     }
 }