From 5d62123a22c68c54106ed57eb8bf2cf9f88d1f34 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Thu, 10 Jan 2019 18:17:03 +0100
Subject: [PATCH] #248 removed autoNat from menu

---
 home.admin/00settingsMenuServices.sh | 41 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh
index 8ce3a82c..f6217971 100644
--- a/home.admin/00settingsMenuServices.sh
+++ b/home.admin/00settingsMenuServices.sh
@@ -3,7 +3,8 @@
 # get raspiblitz config
 source /mnt/hdd/raspiblitz.conf
 if [ ${#autoPilot} -eq 0 ]; then autoPilot="off"; fi
-if [ ${#autoNatDiscovery} -eq 0 ]; then autoNatDiscovery="off"; fi
+# deactivated - see https://github.com/rootzoll/raspiblitz/issues/248
+#if [ ${#autoNatDiscovery} -eq 0 ]; then autoNatDiscovery="off"; fi
 if [ ${#autoUnlock} -eq 0 ]; then autoUnlock="off"; fi
 if [ ${#runBehindTor} -eq 0 ]; then runBehindTor="off"; fi
 if [ ${#rtlWebinterface} -eq 0 ]; then rtlWebinterface="off"; fi
@@ -25,11 +26,12 @@ fi
 CHOICES=$(dialog --checklist 'Activate/Deactivate Services:' 15 45 7 \
 1 'Channel Autopilot' ${autoPilot} \
 2 'Testnet' ${chainValue} \
-3 'Router AutoNAT' ${autoNatDiscovery} \
-4 ${dynDomainMenu} ${domainValue} \
-5 'Run behind TOR' ${runBehindTor} \
-6 'RTL Webinterface' ${rtlWebinterface} \
-7 'LND Auto-Unlock' ${autoUnlock} \
+# deactivated - see https://github.com/rootzoll/raspiblitz/issues/248
+# 3 'Router AutoNAT' ${autoNatDiscovery} \
+3 ${dynDomainMenu} ${domainValue} \
+4 'Run behind TOR' ${runBehindTor} \
+5 'RTL Webinterface' ${rtlWebinterface} \
+6 'LND Auto-Unlock' ${autoUnlock} \
 2>&1 >/dev/tty)
 dialogcancel=$?
 clear
@@ -125,19 +127,20 @@ else
   echo "Testnet Setting unchanged."
 fi
 
+# deactivated - see https://github.com/rootzoll/raspiblitz/issues/248
 # AUTONAT process choice
-choice="off"; check=$(echo "${CHOICES}" | grep -c "3")
-if [ ${check} -eq 1 ]; then choice="on"; fi
-if [ "${autoNatDiscovery}" != "${choice}" ]; then
-  echo "AutoNAT Setting changed .."
-  sudo /home/admin/config.scripts/lnd.autonat.sh ${choice}
-  needsReboot=1
-else 
-  echo "AutoNAT Setting unchanged."
-fi
+# choice="off"; check=$(echo "${CHOICES}" | grep -c "3")
+# if [ ${check} -eq 1 ]; then choice="on"; fi
+# if [ "${autoNatDiscovery}" != "${choice}" ]; then
+#  echo "AutoNAT Setting changed .."
+#  sudo /home/admin/config.scripts/lnd.autonat.sh ${choice}
+#  needsReboot=1
+# else 
+#  echo "AutoNAT Setting unchanged."
+# fi
 
 # Dynamic Domain
-choice="off"; check=$(echo "${CHOICES}" | grep -c "4")
+choice="off"; check=$(echo "${CHOICES}" | grep -c "3")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${domainValue}" != "${choice}" ]; then
   echo "Dynamic Domain changed .."
@@ -148,7 +151,7 @@ else
 fi
 
 # TOR process choice
-choice="off"; check=$(echo "${CHOICES}" | grep -c "5")
+choice="off"; check=$(echo "${CHOICES}" | grep -c "4")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${runBehindTor}" != "${choice}" ]; then
   echo "TOR Setting changed .."
@@ -159,7 +162,7 @@ else
 fi
 
 # RTL process choice
-choice="off"; check=$(echo "${CHOICES}" | grep -c "6")
+choice="off"; check=$(echo "${CHOICES}" | grep -c "5")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${rtlWebinterface}" != "${choice}" ]; then
   echo "RTL Webinterface Setting changed .."
@@ -177,7 +180,7 @@ else
 fi
 
 # LND Auto-Unlock
-choice="off"; check=$(echo "${CHOICES}" | grep -c "7")
+choice="off"; check=$(echo "${CHOICES}" | grep -c "6")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${autoUnlock}" != "${choice}" ]; then
   echo "LND Autounlock Setting changed .."