From bba671fd044d70aefaa9a568fc5c93ae26e6c1ef Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:30:00 -0400
Subject: [PATCH 01/11] Update technitiumdns-v3.sh
---
ct/technitiumdns-v3.sh | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/ct/technitiumdns-v3.sh b/ct/technitiumdns-v3.sh
index 332221a8..85e9e3e0 100644
--- a/ct/technitiumdns-v3.sh
+++ b/ct/technitiumdns-v3.sh
@@ -209,6 +209,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="-gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -230,6 +253,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
@@ -267,7 +291,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS="
-features $FEATURES
-hostname $HN
- -net0 name=eth0,bridge=vmbr0,ip=$NET
+ -net0 name=eth0,bridge=vmbr0,$GATE,ip=$NET
$VLAN
-onboot 1
-cores $CORE_COUNT
From 9c19cf871c443f07e2848a630c850401d5e9c67a Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:35:59 -0400
Subject: [PATCH 02/11] Update technitiumdns-v3.sh
---
ct/technitiumdns-v3.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ct/technitiumdns-v3.sh b/ct/technitiumdns-v3.sh
index 85e9e3e0..761150f1 100644
--- a/ct/technitiumdns-v3.sh
+++ b/ct/technitiumdns-v3.sh
@@ -79,8 +79,10 @@ function default_settings() {
RAM_SIZE="512"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -214,7 +216,7 @@ header_info
if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
else
- GATE="-gw=$GATE1"
+ GATE="gw=$GATE1"
echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
fi;
echo -e " ${CM}${CL} \n"
From b9bb0d6784eede36c7ee4e040c2e6836c86f29e6 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:42:13 -0400
Subject: [PATCH 03/11] Update photoprism-v3.sh
---
ct/photoprism-v3.sh | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/ct/photoprism-v3.sh b/ct/photoprism-v3.sh
index 71a9ef3e..582ff69c 100644
--- a/ct/photoprism-v3.sh
+++ b/ct/photoprism-v3.sh
@@ -79,8 +79,10 @@ function default_settings() {
RAM_SIZE="2048"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -209,6 +211,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="-gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -230,6 +255,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
From 710b6ce3294c20548c95e953ab8dcf112137b407 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:49:30 -0400
Subject: [PATCH 04/11] Update debian-v3.sh
---
ct/debian-v3.sh | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/ct/debian-v3.sh b/ct/debian-v3.sh
index 7e2e371d..b6ec7ea8 100644
--- a/ct/debian-v3.sh
+++ b/ct/debian-v3.sh
@@ -79,8 +79,10 @@ function default_settings() {
RAM_SIZE="512"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -209,6 +211,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -230,6 +255,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
From 98f949a5ecb80c5e592473d85e76024ef054f4ad Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:52:55 -0400
Subject: [PATCH 05/11] Update docker-v3.sh
---
ct/docker-v3.sh | 32 +++++++++++++++++++++++++++++---
1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/ct/docker-v3.sh b/ct/docker-v3.sh
index 1420c176..6b05fe5a 100644
--- a/ct/docker-v3.sh
+++ b/ct/docker-v3.sh
@@ -77,9 +77,11 @@ function default_settings() {
echo -e "${DGN}Using ${BGN}2048MiB${CL}${DGN} RAM${CL}"
RAM_SIZE="2048"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
- NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ NET=dhcp
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -208,6 +210,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -229,6 +254,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
From 5fd42b8f3b6337d50146b333a389243502d71533 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:54:50 -0400
Subject: [PATCH 06/11] Update esphome-v3.sh
---
ct/esphome-v3.sh | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/ct/esphome-v3.sh b/ct/esphome-v3.sh
index 75d44abc..2d6fa4c3 100644
--- a/ct/esphome-v3.sh
+++ b/ct/esphome-v3.sh
@@ -80,8 +80,10 @@ function default_settings() {
RAM_SIZE="1024"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -210,6 +212,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -231,8 +256,8 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
-
read -p "Are these settings correct(y/n)? " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]
From e2ff9a51aa42e7446e72cab7b4351142757fe8ac Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:56:44 -0400
Subject: [PATCH 07/11] Update homeassistant-v3.sh
---
ct/homeassistant-v3.sh | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/ct/homeassistant-v3.sh b/ct/homeassistant-v3.sh
index 72bae187..f147cfe7 100644
--- a/ct/homeassistant-v3.sh
+++ b/ct/homeassistant-v3.sh
@@ -78,8 +78,10 @@ function default_settings() {
RAM_SIZE="2048"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -208,6 +210,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -229,6 +254,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
From 1fee62841f159f420b8ad04eb00fa84541eeb265 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 21:58:20 -0400
Subject: [PATCH 08/11] Update podman-homeassistant-v3.sh
---
ct/podman-homeassistant-v3.sh | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/ct/podman-homeassistant-v3.sh b/ct/podman-homeassistant-v3.sh
index c92ac739..15c837b7 100644
--- a/ct/podman-homeassistant-v3.sh
+++ b/ct/podman-homeassistant-v3.sh
@@ -84,8 +84,10 @@ function default_settings() {
RAM_SIZE="2048"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
- VLAN=" "
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ VLAN=" "
}
function advanced_settings() {
@@ -214,6 +216,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -235,6 +260,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
From 014500782b179f39afe4abf6e3321e9520ae6551 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 22:00:29 -0400
Subject: [PATCH 09/11] Update zigbee2mqtt-v3.sh
---
ct/zigbee2mqtt-v3.sh | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/ct/zigbee2mqtt-v3.sh b/ct/zigbee2mqtt-v3.sh
index e4dd28d3..aafd2f5f 100644
--- a/ct/zigbee2mqtt-v3.sh
+++ b/ct/zigbee2mqtt-v3.sh
@@ -80,7 +80,9 @@ function default_settings() {
RAM_SIZE="1024"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
VLAN=" "
}
@@ -210,6 +212,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -231,8 +256,8 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
-
read -p "Are these settings correct(y/n)? " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]
From 372ecedb383afc2b8e45fa3e9b0d14486becb2f8 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 22:03:45 -0400
Subject: [PATCH 10/11] Update zwavejs2mqtt-v3.sh
---
ct/zwavejs2mqtt-v3.sh | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/ct/zwavejs2mqtt-v3.sh b/ct/zwavejs2mqtt-v3.sh
index 74a2e586..0d9d226e 100644
--- a/ct/zwavejs2mqtt-v3.sh
+++ b/ct/zwavejs2mqtt-v3.sh
@@ -79,7 +79,9 @@ function default_settings() {
RAM_SIZE="1024"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
- echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
+ echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}"
+ GATE=" "
+ echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
VLAN=" "
}
@@ -209,6 +211,29 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
+ read GATE1
+ if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ else
+ GATE="gw=$GATE1"
+ echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
+ fi;
+echo -e " ${CM}${CL} \n"
+sleep 1
+clear
+header_info
+
+ echo -e "${RD}Using Advanced Settings${CL}"
+ echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
+ echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
+ echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
+ echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
+ echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
+ echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
+ echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
+ echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
@@ -230,6 +255,7 @@ header_info
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
+ echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
From 643b3c9ce47d068a25474b490d96314e18fba3e7 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 17 Apr 2022 22:06:20 -0400
Subject: [PATCH 11/11] Update photoprism-v3.sh
---
ct/photoprism-v3.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ct/photoprism-v3.sh b/ct/photoprism-v3.sh
index 582ff69c..7c90ac2e 100644
--- a/ct/photoprism-v3.sh
+++ b/ct/photoprism-v3.sh
@@ -216,7 +216,7 @@ header_info
if [ -z $GATE1 ]; then GATE1="NONE" GATE=" ";
echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
else
- GATE="-gw=$GATE1"
+ GATE="gw=$GATE1"
echo -en "${DGN}Set Gateway IP To ${BL}$GATE1${CL}"
fi;
echo -e " ${CM}${CL} \n"