From 415cadf5b6a18484f5b09c24c1caebfff5766eff Mon Sep 17 00:00:00 2001 From: Christian Rotzoll Date: Sun, 28 Apr 2019 04:32:51 +0200 Subject: [PATCH] fixing check lnd.conf change --- home.admin/config.scripts/internet.sshtunnel.py | 4 ++-- home.admin/config.scripts/lnd.autounlock.sh | 4 ++-- home.admin/config.scripts/lnd.setaddress.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py index c4f28711f..8b18d5fe8 100755 --- a/home.admin/config.scripts/internet.sshtunnel.py +++ b/home.admin/config.scripts/internet.sshtunnel.py @@ -161,10 +161,10 @@ if sys.argv[1] == "on": # make sure serverdomain is set as tls alias print("Setting server as tls alias") - oldConfigHash=subprocess.getoutput("sudo shasum -a 256 /mnt/hdd/lnd/tls.cert") + oldConfigHash=subprocess.getoutput("sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf") subprocess.call("sudo sed -i \"s/^#tlsextradomain=.*/tlsextradomain=/g\" /mnt/hdd/lnd/lnd.conf", shell=True) subprocess.call("sudo sed -i \"s/^tlsextradomain=.*/tlsextradomain=%s/g\" /mnt/hdd/lnd/lnd.conf" % (serverdomain), shell=True) - newConfigHash=subprocess.getoutput("sudo shasum -a 256 /mnt/hdd/lnd/tls.cert") + newConfigHash=subprocess.getoutput("sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf") if oldConfigHash != newConfigHash: print("lnd.conf changed ... generating new TLS cert") subprocess.call("sudo /home/admin/config.scripts/lnd.newtlscert.sh", shell=True) diff --git a/home.admin/config.scripts/lnd.autounlock.sh b/home.admin/config.scripts/lnd.autounlock.sh index 2730b1269..6658f9d24 100755 --- a/home.admin/config.scripts/lnd.autounlock.sh +++ b/home.admin/config.scripts/lnd.autounlock.sh @@ -76,7 +76,7 @@ fi if [ "$1" = "1" ] || [ "$1" = "on" ]; then # get hash of lnd.conf before edit (to detect if changed later) - md5HashBefore=$(sudo shasum -a 256 /mnt/hdd/lnd/tls.cert) + md5HashBefore=$(sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf) # make sure config values are uncommented sudo sed -i "s/^#restlisten=.*/restlisten=/g" /mnt/hdd/lnd/lnd.conf @@ -97,7 +97,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then sudo sed -i "s/^tlsextraip=.*/tlsextraip=0.0.0.0/g" /mnt/hdd/lnd/lnd.conf # refresh TLS cert (if lnd.conf was changed) - md5HashAfter=$(sudo shasum -a 256 /mnt/hdd/lnd/tls.cert) + md5HashAfter=$(sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf) if [ "${md5HashAfter}" != "${md5HashBefore}" ]; then echo "# lnd.conf changed - TLS certs need refreshing" sudo /home/admin/config.scripts/lnd.newtlscert.sh diff --git a/home.admin/config.scripts/lnd.setaddress.sh b/home.admin/config.scripts/lnd.setaddress.sh index 9b70cb843..d24140ec5 100755 --- a/home.admin/config.scripts/lnd.setaddress.sh +++ b/home.admin/config.scripts/lnd.setaddress.sh @@ -29,7 +29,7 @@ if [ ${configExists} -eq 0 ]; then fi # get hash of lnd.conf before edit (to detect if changed later) -md5HashBefore=$(sudo shasum -a 256 /mnt/hdd/lnd/tls.cert) +md5HashBefore=$(sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf) # FIXED DOMAIN/IP if [ "${mode}" = "on" ]; then @@ -55,7 +55,7 @@ if [ "${mode}" = "on" ]; then sudo sed -i "s/^tlsextradomain=.*/tlsextradomain=${address}/g" /mnt/hdd/lnd/lnd.conf # refresh TLS cert - md5HashAfter=$(sudo shasum -a 256 /mnt/hdd/lnd/tls.cert) + md5HashAfter=$(sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf) if [ "${md5HashAfter}" != "${md5HashBefore}" ]; then echo "# lnd.conf changed - TLS certs need refreshing" sudo /home/admin/config.scripts/lnd.newtlscert.sh @@ -83,7 +83,7 @@ if [ "${mode}" = "off" ]; then sudo sed -i "s/^tlsextradomain=.*/#tlsextradomain=/g" /mnt/hdd/lnd/lnd.conf # refresh TLS cert - md5HashAfter=$(sudo shasum -a 256 /mnt/hdd/lnd/tls.cert) + md5HashAfter=$(sudo shasum -a 256 /mnt/hdd/lnd/lnd.conf) if [ "${md5HashAfter}" != "${md5HashBefore}" ]; then echo "# lnd.conf changed - TLS certs need refreshing" sudo /home/admin/config.scripts/lnd.newtlscert.sh