diff --git a/rootfs/standard/etc/systemd/system/lit.service b/rootfs/standard/etc/systemd/system/lit.service index 51a950ed..775f6215 100644 --- a/rootfs/standard/etc/systemd/system/lit.service +++ b/rootfs/standard/etc/systemd/system/lit.service @@ -8,8 +8,10 @@ After=bitcoin.service lnd.service [Service] ExecStartPre=/usr/bin/is_not_shutting_down.sh +ExecStartPre=/usr/bin/service_scripts/pre_lit.sh ExecStartPre=/usr/bin/wait_on_bitcoin.sh ExecStartPre=/usr/bin/wait_on_lnd.sh +ExecStartPre=+/usr/bin/mynode_gen_lit_config.sh ExecStart=/usr/local/bin/litd --lit-dir=/mnt/hdd/mynode/lit User=bitcoin diff --git a/rootfs/standard/etc/systemd/system/loop.service b/rootfs/standard/etc/systemd/system/loop.service index 0a64daa4..c32be178 100644 --- a/rootfs/standard/etc/systemd/system/loop.service +++ b/rootfs/standard/etc/systemd/system/loop.service @@ -9,7 +9,8 @@ After=lnd.service [Service] ExecStartPre=/usr/bin/is_not_shutting_down.sh ExecStartPre=/usr/bin/wait_on_lnd.sh -EnvironmentFile=/mnt/hdd/mynode/loop/env +ExecStartPre=+/usr/bin/mynode_gen_loop_config.sh +EnvironmentFile=-/mnt/hdd/mynode/loop/env ExecStart=/usr/local/bin/loopd --network=${NETWORK} --loopdir=/mnt/hdd/mynode/loop --lnd.macaroonpath=${LND_ADMIN_MACAROON_PATH} User=bitcoin diff --git a/rootfs/standard/etc/systemd/system/pool.service b/rootfs/standard/etc/systemd/system/pool.service index f509eeae..8cf261ca 100644 --- a/rootfs/standard/etc/systemd/system/pool.service +++ b/rootfs/standard/etc/systemd/system/pool.service @@ -9,7 +9,8 @@ After=lnd.service [Service] ExecStartPre=/usr/bin/is_not_shutting_down.sh ExecStartPre=/usr/bin/wait_on_lnd.sh -EnvironmentFile=/mnt/hdd/mynode/pool/env +ExecStartPre=+/usr/bin/mynode_gen_pool_config.sh +EnvironmentFile=-/mnt/hdd/mynode/pool/env ExecStart=/usr/local/bin/poold --network=${NETWORK} --basedir=/mnt/hdd/mynode/pool User=bitcoin diff --git a/rootfs/standard/usr/bin/service_scripts/pre_lit.sh b/rootfs/standard/usr/bin/service_scripts/pre_lit.sh new file mode 100755 index 00000000..5fa462d6 --- /dev/null +++ b/rootfs/standard/usr/bin/service_scripts/pre_lit.sh @@ -0,0 +1,4 @@ +#!/bin/bash + + +exit 0 \ No newline at end of file diff --git a/rootfs/standard/var/pynode/device_info.py b/rootfs/standard/var/pynode/device_info.py index e1cb0268..ad93dd98 100644 --- a/rootfs/standard/var/pynode/device_info.py +++ b/rootfs/standard/var/pynode/device_info.py @@ -891,7 +891,7 @@ def recheck_premium_plus_token(): os.system("systemctl restart premium_plus_connect") def get_premium_plus_setting_names(): - return ["sync_status","sync_bitcoin_and_lightning","backup_scb","watchtower"] + return ["sync_status","sync_bitcoin_and_lightning","backup_scb","watchtower", "proxy"] def get_premium_plus_settings(): names = get_premium_plus_setting_names() settings = {} @@ -1079,6 +1079,9 @@ def reset_blockchain(): #================================== def delete_lnd_data(): os.system("rm -rf "+LND_DATA_FOLDER) + os.system("rm -rf /mnt/hdd/mynode/pool/*") + os.system("rm -rf /mnt/hdd/mynode/loop/*") + os.system("rm -rf /mnt/hdd/mynode/lit/*") os.system("rm -rf /tmp/lnd_deposit_address") os.system("rm -rf /home/bitcoin/.lnd-admin/credentials.json") os.system("rm -rf /mnt/hdd/mynode/settings/.lndpw")