Update pihole-v3.sh

This commit is contained in:
tteckster 2022-04-21 09:56:56 -04:00 committed by GitHub
parent c57093faa4
commit bf92c72f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -71,11 +71,11 @@ function default_settings() {
CT_ID=$NEXTID CT_ID=$NEXTID
echo -e "${DGN}Using CT Name ${BGN}$NSAPP${CL}" echo -e "${DGN}Using CT Name ${BGN}$NSAPP${CL}"
HN=$NSAPP HN=$NSAPP
echo -e "${DGN}Using Disk Size ${BGN}2GB${CL}" echo -e "${DGN}Using Disk Size ${BGN}2${CL}${DGN}GB${CL}"
DISK_SIZE="2" DISK_SIZE="2"
echo -e "${DGN}Using ${BGN}1vCPU${CL}" echo -e "${DGN}Using ${BGN}1${CL}${DGN}vCPU${CL}"
CORE_COUNT="1" CORE_COUNT="1"
echo -e "${DGN}Using ${BGN}512MiB${CL}${DGN} RAM${CL}" echo -e "${DGN}Using ${BGN}512${CL}${DGN}MiB RAM${CL}"
RAM_SIZE="512" RAM_SIZE="512"
echo -e "${DGN}Using Bridge ${BGN}vmbr0${CL}" echo -e "${DGN}Using Bridge ${BGN}vmbr0${CL}"
BRG="vmbr0" BRG="vmbr0"
@ -150,11 +150,11 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${YW}Enter a Disk Size, or Press [ENTER] for Default: 2Gb " echo -e "${YW}Enter a Disk Size, or Press [ENTER] for Default: 2 "
read DISK_SIZE read DISK_SIZE
if [ -z $DISK_SIZE ]; then DISK_SIZE="2"; fi; if [ -z $DISK_SIZE ]; then DISK_SIZE="2"; fi;
if ! [[ $DISK_SIZE =~ $INTEGER ]] ; then echo "ERROR! DISK SIZE MUST HAVE INTEGER NUMBER!"; exit; fi; if ! [[ $DISK_SIZE =~ $INTEGER ]] ; then echo "ERROR! DISK SIZE MUST HAVE INTEGER NUMBER!"; exit; fi;
echo -en "${DGN}Set Disk Size To ${BL}$DISK_SIZE${CL}" echo -en "${DGN}Set Disk Size To ${BL}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e " ${CM}${CL} \r" echo -e " ${CM}${CL} \r"
sleep 1 sleep 1
clear clear
@ -164,11 +164,11 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${YW}Allocate CPU cores, or Press [ENTER] for Default: 1 " echo -e "${YW}Allocate CPU cores, or Press [ENTER] for Default: 1 "
read CORE_COUNT read CORE_COUNT
if [ -z $CORE_COUNT ]; then CORE_COUNT="1"; fi; if [ -z $CORE_COUNT ]; then CORE_COUNT="1"; fi;
echo -en "${DGN}Set Cores To ${BL}$CORE_COUNT${CL}" echo -en "${DGN}Set Cores To ${BL}$CORE_COUNT${CL}${DGN}vCPU${CL}"
echo -e " ${CM}${CL} \r" echo -e " ${CM}${CL} \r"
sleep 1 sleep 1
clear clear
@ -178,12 +178,12 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}${CL}${DGN}vCPU${CL}"
echo -e "${YW}Allocate RAM in MiB, or Press [ENTER] for Default: 512 " echo -e "${YW}Allocate RAM in MiB, or Press [ENTER] for Default: 512 "
read RAM_SIZE read RAM_SIZE
if [ -z $RAM_SIZE ]; then RAM_SIZE="512"; fi; if [ -z $RAM_SIZE ]; then RAM_SIZE="512"; fi;
echo -en "${DGN}Set RAM To ${BL}$RAM_SIZE${CL}" echo -en "${DGN}Set RAM To ${BL}$RAM_SIZE${CL}${DGN}MiB RAM${CL}"
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
sleep 1 sleep 1
clear clear
@ -193,9 +193,9 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}${CL}${DGN}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}${CL}${DGN}MiB RAM${CL}"
echo -e "${YW}Enter a Bridge, or Press [ENTER] for Default: vmbr0 " echo -e "${YW}Enter a Bridge, or Press [ENTER] for Default: vmbr0 "
read BRG read BRG
if [ -z $BRG ]; then BRG="vmbr0"; fi; if [ -z $BRG ]; then BRG="vmbr0"; fi;
@ -209,9 +209,9 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}${CL}${DGN}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}${CL}${DGN}MiB RAM${CL}"
echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}" echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}"
echo -e "${YW}Enter a Static IP Address, or Press [ENTER] for Default: DHCP " echo -e "${YW}Enter a Static IP Address, or Press [ENTER] for Default: DHCP "
read NET read NET
@ -226,9 +226,9 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}${CL}${DGN}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}${CL}${DGN}MiB RAM${CL}"
echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}" echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}"
echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}"
echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE " echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE "
@ -249,9 +249,9 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}${CL}${DGN}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}${CL}${DGN}MiB RAM${CL}"
echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}" echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}"
echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}"
echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"
@ -272,9 +272,9 @@ header_info
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}${DGN}GB${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}${CL}${DGN}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}${CL}${DGN}MiB RAM${CL}"
echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}" echo -e "${DGN}Using Bridge ${BGN}${BRG}${CL}"
echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}"
echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}"