Merge branch 'master' into ota-updates

README.md

@@ -28,6 +28,7 @@ If you are looking to run Umbrel on your hardware, you do not need to use this r
 - [`LND`](https://github.com/getumbrel/docker-lnd)
 - [`Tor`](https://github.com/getumbrel/docker-tor)
 - [`Nginx`](https://github.com/nginx/nginx)
+- [`lnd-neutrino-switch`](https://github.com/lncm/docker-lnd-neutrino-switch) - Utility container for seamlessly transitioning from neutrino mode to bitcoind mode
 
 
 **Architecture**
@@ -121,4 +122,4 @@ If you're looking for a bigger challenge, before opening a pull request please [
 
 [![License](https://img.shields.io/github/license/getumbrel/umbrel?color=%235351FB)](https://github.com/getumbrel/umbrel/blob/master/LICENSE)
 
-[getumbrel.com](https://getumbrel.com)
+[getumbrel.com](https://getumbrel.com)

docker-compose.yml

@@ -128,6 +128,24 @@ services:
                 networks:
                     net:
                         ipv4_address: 10.11.2.2
+        neutrino-switcher:
+                container_name: neutrino-switcher
+                image: lncm/neutrino-switcher:1.0.2
+                logging: *default-logging
+                depends_on: [ bitcoin, lnd ]
+                restart: unless-stopped
+                volumes:
+                    - "${PWD}/lnd:/lnd"
+                    - "${PWD}/secrets:/secrets"
+                    - "${PWD}/statuses:/statuses"
+                    - "/var/run/docker.sock:/var/run/docker.sock"
+                environment:
+                    JSONRPCURL: http://10.11.1.1:RPCPORT
+                    LND_CONTAINER_NAME: lnd
+                    SLEEPTIME: 3600
+                networks:
+                    net:
+                        ipv4_address: 10.11.5.2
 networks:
     net:
         ipam:
@@ -137,4 +155,4 @@ networks:
 
 volumes:
     jwt-public-key:
-    jwt-private-key:
+    jwt-private-key:

lnd/lnd.conf

@@ -12,19 +12,19 @@ color=#5351FB
 ; 0.9.X keysend functionality
 accept-keysend=true
 
-; Makes routing faster but have to use images built with experimental tag
-[Routing]
-routing.assumechanvalid=1
-
 ; Commented TLS options as they do not seem to work as of v0.10.1-experimental
 ; Extra TLS
-; tlsextradomain=lnd
-; tlsextraip=10.11.1.2
-; Unsure if this is a 0.10.0 command (make mental note to test this)
-; tlsautorefresh=1
+tlsextradomain=lnd
+tlsextraip=10.11.1.2
+; LND 0.10.X feature so we can add in new hosts and not worry about fiddling with tls files
+tlsautorefresh=1
 ; Add external address for TLS
 ;externalip=externaladdress
 
+; Makes routing faster but have to use images built with experimental tag
+[Routing]
+routing.assumechanvalid=1
+
 ; Default setting currently is neutrino
 [Bitcoind]
 bitcoind.rpchost=10.11.1.1
@@ -38,7 +38,6 @@ bitcoind.estimatemode=ECONOMICAL
 ; If the Bitcoin chain should be active. Atm, only a single chain can be
 ; active.
 bitcoin.active=1
-; Change 'bitcoin.mainnet=1' to 'bitcoin.testnet=1' if TESTNET or bitcoin.regtest=1 if REGTEST
 bitcoin.mainnet=1
 ; Use neutrino for now, but maybe it could be permanent and then switch
 ; to a full node if theres enough space