From a806ad9098e9c013e5f5c7dd99252a9f9c8889fa Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Wed, 13 Oct 2021 07:17:55 -0700
Subject: [PATCH] two suggestions by Frank DH4FR

---
 DASHBOARD.README                             | 9 +++++++--
 Makefile                                     | 1 +
 qnadmin                                      | 7 ++++++-
 system/{qndash.service => qndash.service.80} | 0
 4 files changed, 14 insertions(+), 3 deletions(-)
 rename system/{qndash.service => qndash.service.80} (100%)

diff --git a/DASHBOARD.README b/DASHBOARD.README
index 0cb21b7..234977c 100644
--- a/DASHBOARD.README
+++ b/DASHBOARD.README
@@ -6,12 +6,18 @@ how many rows you want in the Last Heard section. You can configure these
 features with the ./qnconfig menu. Don't set the refresh time faster than about
 10 seconds. If you do, it will become difficult to use the Send URCall button.
 
+By default, the installed web server will use ip/port 0.0.0.0:80. If you want
+to use something else, copy qndash.service.80 to qndash.service and edit your
+new file *before* installing the dashboard.
+
 To install the dashboard system, run the following command:
 
 sudo make installdash
 
 Note that this will install a php web server and all necessary packages needed
-for the server. To uninstall, run the following:
+for the server.
+
+To uninstall, run the following:
 
 sudo make uninstalldash
 
@@ -28,7 +34,6 @@ will want to use a hardened server, like apache, and a different index.php file.
 Please note that if you are typing in a URCALL when the webpage is refreshing,
 the entry field will loose focus and you'll have to try again.
 
-
                     #### DASHBOARD V2 ####
 
 A new responsive dashboard built on the Bootstrap 4.5 framework has been
diff --git a/Makefile b/Makefile
index 3352a00..becd24e 100644
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,7 @@ installdash : index.php
 	mkdir -p dashboardV2/jsonData
 	/bin/ln -f -s $(shell pwd)/index.php $(WWWDIR)
 	/bin/ln -f -s $(shell pwd)/dashboardV2 $(WWWDIR)
+	if [ ! -e qndash.service ]; then cp qndash.service.80 qndash.service; fi
 	/bin/cp -f system/qndash.service $(SYSDIR)
 	systemctl enable qndash.service
 	systemctl daemon-reload
diff --git a/qnadmin b/qnadmin
index 9b6bc4b..940aecb 100755
--- a/qnadmin
+++ b/qnadmin
@@ -635,6 +635,11 @@ MaintenanceMenu () {
 }
 
 GatewayMenu () {
+	which wget > /dev/null
+	if test $? -ne 0; then
+		echo 'wget not found, installing...'
+		sudo apt install wget
+	fi
 	ans=''
 	while [[ "$ans" != q* ]]; do
 		local refcount=$( grep -s "^REF" gwys.txt | wc -l )
@@ -784,7 +789,7 @@ MODULE_COUNT=$((ndvap + ndvrptr + nitap + nmmdvm + nmodem))
 while [[ "$ans" != q* ]]; do
 	clear
 	echo
-	echo "            Qnet Administration Menu"
+	echo "            Qnet Administration Menu V#211013"
 	Header
 	BaseStatus
 	ModuleStatus 0 a "$module_a"
diff --git a/system/qndash.service b/system/qndash.service.80
similarity index 100%
rename from system/qndash.service
rename to system/qndash.service.80