diff --git a/CHANGES.md b/CHANGES.md index 5ccd47662..ebe96b066 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ - New: Raspberry Pi OS Base Image 64-bit (August 2020) - New: Build SD card Image with parameters & FatPack [details](https://github.com/rootzoll/raspiblitz/pull/2044) +- New: Improve LND uptime and reliability over Tor [details](https://github.com/rootzoll/raspiblitz/pull/2148) - New: Lightning Terminal 0.4.1-alpha (Loop, Pool & Faraday UI Bundle) [details](https://github.com/lightninglabs/lightning-terminal#lightning-terminal-lit) - New: chantools 0.8.2 [details](https://github.com/guggero/chantools/blob/master/README.md) - New: Circuitbreaker LND firewall (settings menu) [details](https://github.com/lightningequipment/circuitbreaker/blob/master/README.md) diff --git a/home.admin/config.scripts/bonus.joinmarket.sh b/home.admin/config.scripts/bonus.joinmarket.sh index 55abd7943..f470944d0 100755 --- a/home.admin/config.scripts/bonus.joinmarket.sh +++ b/home.admin/config.scripts/bonus.joinmarket.sh @@ -145,11 +145,11 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then sudo sed -i "s:^CookieAuthFile*:#CookieAuthFile:g" /etc/tor/torrc if ! grep -Eq "^CookieAuthentication 1" /etc/tor/torrc; then echo "CookieAuthentication 1" | sudo tee -a /etc/tor/torrc - sudo systemctl restart tor + sudo systemctl restart tor@default fi if ! grep -Eq "^AllowOutboundLocalhost 1" /etc/tor/torsocks.conf; then echo "AllowOutboundLocalhost 1" | sudo tee -a /etc/tor/torsocks.conf - sudo systemctl restart tor + sudo systemctl restart tor@default fi # joinin.conf settings diff --git a/home.admin/config.scripts/internet.hiddenservice.sh b/home.admin/config.scripts/internet.hiddenservice.sh index e4ac7fc86..1c2e6eaef 100755 --- a/home.admin/config.scripts/internet.hiddenservice.sh +++ b/home.admin/config.scripts/internet.hiddenservice.sh @@ -35,7 +35,7 @@ if [ "$1" == "off" ]; then sudo chown bitcoin:bitcoin /etc/tor/torrc echo "# OK service is removed - restarting TOR ..." - sudo systemctl restart tor + sudo systemctl restart tor@default sleep 10 echo "# Done" exit 0 @@ -100,7 +100,7 @@ HiddenServicePort $toPort 127.0.0.1:$fromPort" | sudo tee -a /etc/tor/torrc echo "" echo "Restarting Tor to activate the Hidden Service..." sudo chmod 644 /etc/tor/torrc - sudo systemctl restart tor + sudo systemctl restart tor@default sleep 10 # show the Hidden Service address diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh index 8efc72af6..223e9948f 100755 --- a/home.admin/config.scripts/internet.tor.sh +++ b/home.admin/config.scripts/internet.tor.sh @@ -87,26 +87,100 @@ activateLndOverTOR() lndExists=$(sudo ls /etc/systemd/system/lnd.service | grep -c "lnd.service") if [ ${lndExists} -gt 0 ]; then - echo "# Make sure the user bitcoin is in the debian-tor group" - sudo usermod -a -G debian-tor bitcoin # deprecate 'torpassword=' sudo sed -i '/\[Tor\]*/d' /mnt/hdd/lnd/lnd.conf sudo sed -i '/^tor.password=*/d' /mnt/hdd/lnd/lnd.conf + # lnd-tor instance + # https://www.torservers.net/wiki/setup/server#multiple_tor_processes + NODENAME="lnd" + SOCKSPORT=9070 + CONTROLPORT=$((SOCKSPORT+1)) + echo "# Creating a dedicated Tor instance for $NODENAME" + sudo tor-instance-create $NODENAME + + echo "# Make sure the user bitcoin is in the _tor-$NODENAME group" + sudo usermod -a -G _tor-$NODENAME bitcoin + + # create tor data directory if it not exist + if [ ! -d "/mnt/hdd/tor-$NODENAME" ]; then + echo "# - creating tor data directory" + sudo mkdir -p /mnt/hdd/tor-$NODENAME + sudo mkdir -p /mnt/hdd/tor-$NODENAME/sys + else + echo "# - /mnt/hdd/tor-$NODENAME data directory exists" + fi + # make sure its the correct owner + sudo chmod -R 700 /mnt/hdd/tor-$NODENAME + sudo chown -R _tor-$NODENAME:_tor-$NODENAME /mnt/hdd/tor-$NODENAME + + echo " +### torrc for tor@$NODENAME +### https://github.com/lightningnetwork/lnd/blob/master/docs/configuring_tor.md + +DataDirectory /mnt/hdd/tor-$NODENAME/sys +PidFile /mnt/hdd/tor-$NODENAME/sys/tor.pid + +SocksPort $SOCKSPORT +ControlPort $CONTROLPORT +CookieAuthentication 1 +CookieAuthFileGroupReadable 1 + +SafeLogging 1 +Log notice stdout +Log notice file /mnt/hdd/tor-$NODENAME/notice.log +Log info file /mnt/hdd/tor-$NODENAME/info.log +" | sudo tee /etc/tor/instances/$NODENAME/torrc + sudo chmod 644 /etc/tor/instances/$NODENAME/torrc + + sudo mkdir -p /etc/systemd/system/tor@$NODENAME.service.d + sudo tee /etc/systemd/system/tor@$NODENAME.service.d/raspiblitz.conf >/dev/null </dev/null < /dev/null; then + invoke-rc.d tor reload > /dev/null + fi + endscript +} +EOF + sudo systemctl daemon-reload + sudo systemctl enable tor@$NODENAME + sudo systemctl start tor@$NODENAME + # modify LND service - echo "Make sure LND is disabled" + echo "# Make sure LND is disabled" sudo systemctl disable lnd 2>/dev/null - echo "editing /etc/systemd/system/lnd.service" - sudo sed -i "s/^ExecStart=\/usr\/local\/bin\/lnd.*/ExecStart=\/usr\/local\/bin\/lnd --tor\.active --tor\.streamisolation --tor\.v3 --listen=127\.0\.0\.1\:9735 \${lndExtraParameter}/g" /etc/systemd/system/lnd.service + echo "# Editing /etc/systemd/system/lnd.service" + sudo sed -i "s/^ExecStart=\/usr\/local\/bin\/lnd.*\ +/ExecStart=\/usr\/local\/bin\/lnd --tor\.active --tor\.streamisolation --tor\.v3 --tor\.socks=$SOCKSPORT --tor\.control=$CONTROLPORT --listen=127\.0\.0\.1\:9735 \${lndExtraParameter}/g" \ + /etc/systemd/system/lnd.service - echo "Enable LND again" + echo "# Enable LND again" sudo systemctl enable lnd - echo "OK" - echo "" + echo "# OK" + echo else - echo "LND service not found (yet) - try with 'internet.tor.sh lndconf-on' again later" + echo "# LND service not found (yet) - try with 'internet.tor.sh lndconf-on' again later" fi } @@ -231,9 +305,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then isTorConfigOK=$(sudo cat /etc/tor/torrc 2>/dev/null | grep -c "BITCOIN") if [ ${isTorConfigOK} -eq 0 ]; then echo "# - updating Tor config ${torrc}" - PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-) - HASHED_PASSWORD=$(sudo -u debian-tor tor --hash-password "$PASSWORD_B") cat > ./torrc <