diff --git a/ct/audiobookshelf-v5.sh b/ct/audiobookshelf-v5.sh
deleted file mode 100644
index ca4e5c9b..00000000
--- a/ct/audiobookshelf-v5.sh
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ___ __ __ __ ______
- ____ ___ ______/ (_)___v5/ /_ ____ ____ / /_______/ /_ ___ / / __/
- / __ `/ / / / __ / / __ \/ __ \/ __ \/ __ \/ //_/ ___/ __ \/ _ \/ / /_
-/ /_/ / /_/ / /_/ / / /_/ / /_/ / /_/ / /_/ / ,< (__ ) / / / __/ / __/
-\__,_/\__,_/\__,_/_/\____/_.___/\____/\____/_/|_/____/_/ /_/\___/_/_/
-
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="audiobookshelf"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
- CT_TYPE="0"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" OFF \
- "0" "Privileged" ON \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating $APP LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated $APP LXC"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
- ${BL}http://${IP}:13378${CL} \n"
diff --git a/ct/audiobookshelf.sh b/ct/audiobookshelf.sh
new file mode 100644
index 00000000..233069e3
--- /dev/null
+++ b/ct/audiobookshelf.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ___ __ __ __ ______
+ ____ ___ ______/ (_)___ / /_ ____ ____ / /_______/ /_ ___ / / __/
+ / __ `/ / / / __ / / __ \/ __ \/ __ \/ __ \/ //_/ ___/ __ \/ _ \/ / /_
+/ /_/ / /_/ / /_/ / / /_/ / /_/ / /_/ / /_/ / ,< (__ ) / / / __/ / __/
+\__,_/\__,_/\__,_/_/\____/_.___/\____/\____/_/|_/____/_/ /_/\___/_/_/
+
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="audiobookshelf"
+var_disk="4"
+var_cpu="2"
+var_ram="2048"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+ ${BL}http://${IP}:13378${CL} \n"
diff --git a/ct/autobrr-v5.sh b/ct/autobrr-v5.sh
deleted file mode 100644
index b0ad08cc..00000000
--- a/ct/autobrr-v5.sh
+++ /dev/null
@@ -1,437 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ___ __ __
- / | __ __/ /_____ / /_v5__________
- / /| |/ / / / __/ __ \/ __ \/ ___/ ___/
- / ___ / /_/ / /_/ /_/ / /_/ / / / /
-/_/ |_\__,_/\__/\____/_.___/_/ /_/
-
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Autobrr"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
- CT_TYPE="1"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Stopping ${APP} LXC"
-systemctl stop autobrr.service
-msg_ok "Stopped ${APP} LXC"
-
-msg_info "Updating ${APP} LXC"
-rm -rf /usr/local/bin/*
-wget -q $(curl -s https://api.github.com/repos/autobrr/autobrr/releases/latest | grep download | grep linux_x86_64 | cut -d\" -f4)
-tar -C /usr/local/bin -xzf autobrr*.tar.gz
-rm -rf autobrr*.tar.gz
-msg_ok "Updated ${APP} LXC"
-
-msg_info "Starting ${APP} LXC"
-systemctl start autobrr.service
-msg_ok "Started ${APP} LXC"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /root/.config/autobrr/config.toml ]]; then
- msg_error "No ${APP} Installation Found!"
- exit
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
- ${BL}http://${IP}:7474${CL} \n"
diff --git a/ct/autobrr.sh b/ct/autobrr.sh
new file mode 100644
index 00000000..968c89f0
--- /dev/null
+++ b/ct/autobrr.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ___ __ __
+ / | __ __/ /_____ / /_ __________
+ / /| |/ / / / __/ __ \/ __ \/ ___/ ___/
+ / ___ / /_/ / /_/ /_/ / /_/ / / / /
+/_/ |_\__,_/\__/\____/_.___/_/ /_/
+
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Autobrr"
+var_disk="8"
+var_cpu="2"
+var_ram="2048"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Stopping ${APP} LXC"
+systemctl stop autobrr.service
+msg_ok "Stopped ${APP} LXC"
+
+msg_info "Updating ${APP} LXC"
+rm -rf /usr/local/bin/*
+wget -q $(curl -s https://api.github.com/repos/autobrr/autobrr/releases/latest | grep download | grep linux_x86_64 | cut -d\" -f4)
+tar -C /usr/local/bin -xzf autobrr*.tar.gz
+rm -rf autobrr*.tar.gz
+msg_ok "Updated ${APP} LXC"
+
+msg_info "Starting ${APP} LXC"
+systemctl start autobrr.service
+msg_ok "Started ${APP} LXC"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+ ${BL}http://${IP}:7474${CL} \n"
diff --git a/ct/blocky-v5.sh b/ct/blocky-v5.sh
deleted file mode 100644
index 64b905d2..00000000
--- a/ct/blocky-v5.sh
+++ /dev/null
@@ -1,425 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ____ __ __
- / __ )/ /___v5_____/ /____ __
- / __ / / __ \/ ___/ //_/ / / /
- / /_/ / / /_/ / /__/ ,< / /_/ /
-/_____/_/\____/\___/_/|_|\__, /
- /____/
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Blocky"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
- CT_TYPE="1"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP} LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated ${APP} LXC"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -d /opt/blocky ]]; then
- msg_error "No ${APP} Installation Found!"
- exit
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
diff --git a/ct/blocky.sh b/ct/blocky.sh
new file mode 100644
index 00000000..08d95da4
--- /dev/null
+++ b/ct/blocky.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ____ __ __
+ / __ )/ /___ _____/ /____ __
+ / __ / / __ \/ ___/ //_/ / / /
+ / /_/ / / /_/ / /__/ ,< / /_/ /
+/_____/_/\____/\___/_/|_|\__, /
+ /____/
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Blocky"
+var_disk="2"
+var_cpu="1"
+var_ram="512"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
diff --git a/ct/casaos.sh b/ct/casaos.sh
index 83ab46ed..415f5ab4 100644
--- a/ct/casaos.sh
+++ b/ct/casaos.sh
@@ -64,6 +64,7 @@ exit
start
build_container
description
+
msg_ok "Completed Successfully!\n"
echo -e "${APP} Setup should be reachable by going to the following URL.
${BL}http://${IP} ${CL} \n"
diff --git a/ct/changedetection-v5.sh b/ct/changedetection-v5.sh
deleted file mode 100644
index 64899ce7..00000000
--- a/ct/changedetection-v5.sh
+++ /dev/null
@@ -1,426 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ________ ____ __ __ _
- / ____/ /_v5____ _____ ____ ____ / __ \___ / /____ _____/ /_(_)___ ____
- / / / __ \/ __ `/ __ \/ __ `/ _ \ / / / / _ \/ __/ _ \/ ___/ __/ / __ \/ __ \
-/ /___/ / / / /_/ / / / / /_/ / __/ / /_/ / __/ /_/ __/ /__/ /_/ / /_/ / / / /
-\____/_/ /_/\__,_/_/ /_/\__, /\___/ /_____/\___/\__/\___/\___/\__/_/\____/_/ /_/
- /____/
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Change Detection"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
- CT_TYPE="1"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP} LXC"
-pip3 install changedetection.io --upgrade &>/dev/null
-msg_ok "Updated ${APP} LXC"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/systemd/system/changedetection.service ]]; then
- msg_error "No ${APP} Installation Found!"
- exit
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
- ${BL}http://${IP}:5000${CL} \n"
diff --git a/ct/changedetection.sh b/ct/changedetection.sh
new file mode 100644
index 00000000..7d6cfb0a
--- /dev/null
+++ b/ct/changedetection.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ________ ____ __ __ _
+ / ____/ /_ ____ _____ ____ ____ / __ \___ / /____ _____/ /_(_)___ ____
+ / / / __ \/ __ `/ __ \/ __ `/ _ \ / / / / _ \/ __/ _ \/ ___/ __/ / __ \/ __ \
+/ /___/ / / / /_/ / / / / /_/ / __/ / /_/ / __/ /_/ __/ /__/ /_/ / /_/ / / / /
+\____/_/ /_/\__,_/_/ /_/\__, /\___/ /_____/\___/\__/\___/\___/\__/_/\____/_/ /_/
+ /____/
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Change Detection"
+var_disk="2"
+var_cpu="1"
+var_ram="512"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating ${APP} LXC"
+pip3 install changedetection.io --upgrade &>/dev/null
+msg_ok "Updated ${APP} LXC"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+ ${BL}http://${IP}:5000${CL} \n"
diff --git a/ct/cronicle-v5.sh b/ct/cronicle-v5.sh
deleted file mode 100644
index 890b08cc..00000000
--- a/ct/cronicle-v5.sh
+++ /dev/null
@@ -1,468 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ______ _ __
- / ____/________v5____ (_)____/ /__
- / / / ___/ __ \/ __ \/ / ___/ / _ \
-/ /___/ / / /_/ / / / / / /__/ / __/
-\____/_/ \____/_/ /_/_/\___/_/\___/
-
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Cronicle"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-hostname="$(hostname)"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
- CT_TYPE="1"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-SERVER="y"
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 2 \
- "1" "Update ${APP}" ON \
- "2" "Install ${APP} Worker" OFF \
- 3>&1 1>&2 2>&3)
-
-header_info
-if [ "$UPD" == "1" ]; then
- if [[ ! -d /opt/cronicle ]]; then
- msg_error "No ${APP} Installation Found!";
- exit
- fi
-msg_info "Updating ${APP}"
-/opt/cronicle/bin/control.sh upgrade &>/dev/null
-msg_ok "Updated ${APP}"
-exit
-fi
-if [ "$UPD" == "2" ]; then
-LATEST=$(curl -sL https://api.github.com/repos/jhuckaby/Cronicle/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
-IP=$(hostname -I | awk '{print $1}')
-msg_info "Installing Dependencies"
-
-apt-get install -y git &>/dev/null
-apt-get install -y make &>/dev/null
-apt-get install -y g++ &>/dev/null
-apt-get install -y gcc &>/dev/null
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up Node.js Repository"
-bash <(curl -fsSL https://deb.nodesource.com/setup_16.x) &>/dev/null
-msg_ok "Set up Node.js Repository"
-
-msg_info "Installing Node.js"
-apt-get install -y nodejs &>/dev/null
-msg_ok "Installed Node.js"
-
-msg_info "Installing Cronicle Worker"
-mkdir -p /opt/cronicle
-cd /opt/cronicle
-tar zxvf <(curl -fsSL https://github.com/jhuckaby/Cronicle/archive/${LATEST}.tar.gz) --strip-components 1 &>/dev/null
-npm install &>/dev/null
-node bin/build.js dist &>/dev/null
-sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json
-/opt/cronicle/bin/control.sh start &>/dev/null
-cp /opt/cronicle/bin/cronicled.init /etc/init.d/cronicled &>/dev/null
-chmod 775 /etc/init.d/cronicled
-update-rc.d cronicled defaults &>/dev/null
-msg_ok "Installed Cronicle Worker on $hostname"
-echo -e "\n Add Masters secret key to /opt/cronicle/conf/config.json \n"
-exit
-fi
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export SERV=$SERVER
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Primary should be reachable by going to the following URL.
- ${BL}http://${IP}:3012${CL} admin|admin \n"
diff --git a/ct/cronicle.sh b/ct/cronicle.sh
new file mode 100644
index 00000000..d7477d49
--- /dev/null
+++ b/ct/cronicle.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ______ _ __
+ / ____/________ ____ (_)____/ /__
+ / / / ___/ __ \/ __ \/ / ___/ / _ \
+/ /___/ / / /_/ / / / / / /__/ / __/
+\____/_/ \____/_/ /_/_/\___/_/\___/
+
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Cronicle"
+var_disk="2"
+var_cpu="1"
+var_ram="512"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 2 \
+ "1" "Update ${APP}" ON \
+ "2" "Install ${APP} Worker" OFF \
+ 3>&1 1>&2 2>&3)
+
+header_info
+if [ "$UPD" == "1" ]; then
+ if [[ ! -d /opt/cronicle ]]; then
+ msg_error "No ${APP} Installation Found!";
+ exit
+ fi
+msg_info "Updating ${APP}"
+/opt/cronicle/bin/control.sh upgrade &>/dev/null
+msg_ok "Updated ${APP}"
+exit
+fi
+if [ "$UPD" == "2" ]; then
+LATEST=$(curl -sL https://api.github.com/repos/jhuckaby/Cronicle/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
+IP=$(hostname -I | awk '{print $1}')
+msg_info "Installing Dependencies"
+
+apt-get install -y git &>/dev/null
+apt-get install -y make &>/dev/null
+apt-get install -y g++ &>/dev/null
+apt-get install -y gcc &>/dev/null
+msg_ok "Installed Dependencies"
+
+msg_info "Setting up Node.js Repository"
+bash <(curl -fsSL https://deb.nodesource.com/setup_16.x) &>/dev/null
+msg_ok "Set up Node.js Repository"
+
+msg_info "Installing Node.js"
+apt-get install -y nodejs &>/dev/null
+msg_ok "Installed Node.js"
+
+msg_info "Installing Cronicle Worker"
+mkdir -p /opt/cronicle
+cd /opt/cronicle
+tar zxvf <(curl -fsSL https://github.com/jhuckaby/Cronicle/archive/${LATEST}.tar.gz) --strip-components 1 &>/dev/null
+npm install &>/dev/null
+node bin/build.js dist &>/dev/null
+sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json
+/opt/cronicle/bin/control.sh start &>/dev/null
+cp /opt/cronicle/bin/cronicled.init /etc/init.d/cronicled &>/dev/null
+chmod 775 /etc/init.d/cronicled
+update-rc.d cronicled defaults &>/dev/null
+msg_ok "Installed Cronicle Worker on $hostname"
+echo -e "\n Add Masters secret key to /opt/cronicle/conf/config.json \n"
+exit
+fi
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} Primary should be reachable by going to the following URL.
+ ${BL}http://${IP}:3012${CL} admin|admin \n"
diff --git a/ct/daemonsync-v5.sh b/ct/daemonsync-v5.sh
deleted file mode 100644
index bb50f147..00000000
--- a/ct/daemonsync-v5.sh
+++ /dev/null
@@ -1,427 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ____ _____
- / __ \____ ____ ____ ___ ____ ____ / ___/__v5______ _____
- / / / / __ / _ \/ __ __ \/ __ \/ __ \ \__ \/ / / / __ \/ ___/
- / /_/ / /_/ / __/ / / / / / /_/ / / / / ___/ / /_/ / / / / /__
-/_____/\__,_/\___/_/ /_/ /_/\____/_/ /_/ /____/\__, /_/ /_/\___/
- /____/
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Daemon Sync"
-var_disk="8"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
- CT_TYPE="1"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP} LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated ${APP} LXC"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -d /etc/daemonsync ]]; then
- msg_error "No ${APP} Installation Found!"
- exit
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
- ${BL}http://${IP}:8084${CL} \n"
diff --git a/ct/daemonsync.sh b/ct/daemonsync.sh
new file mode 100644
index 00000000..091e1bad
--- /dev/null
+++ b/ct/daemonsync.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ____ _____
+ / __ \____ ____ ____ ___ ____ ____ / ___/__ ______ _____
+ / / / / __ / _ \/ __ __ \/ __ \/ __ \ \__ \/ / / / __ \/ ___/
+ / /_/ / /_/ / __/ / / / / / /_/ / / / / ___/ / /_/ / / / / /__
+/_____/\__,_/\___/_/ /_/ /_/\____/_/ /_/ /____/\__, /_/ /_/\___/
+ /____/
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Daemon Sync"
+var_disk="8"
+var_cpu="1"
+var_ram="512"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+ ${BL}http://${IP}:8084${CL} \n"
diff --git a/ct/dashy-v5.sh b/ct/dashy-v5.sh
deleted file mode 100644
index 0b63ea64..00000000
--- a/ct/dashy-v5.sh
+++ /dev/null
@@ -1,452 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- ____ __
- / __ \____ ______/ /_ __ __
- / / / / __ / ___/ __ \/ / / /
- / /_/ / /_/ (__ ) / / / /_/ /
-/_____/\__,_/____/_/ /_/\__, /
- v5 /____/
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Dashy"
-var_disk="6"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
- CT_TYPE="1"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Stopping ${APP}"
-systemctl stop dashy
-msg_ok "Stopped ${APP}"
-
-msg_info "Backing up conf.yml"
-cd ~
-cp -R /dashy/public/conf.yml conf.yml
-msg_ok "Backed up conf.yml"
-
-msg_info "Updating Dashy"
-cd /dashy
-git merge &>/dev/null
-git pull origin master &>/dev/null
-yarn &>/dev/null
-yarn build &>/dev/null
-msg_ok "Updated Dashy"
-
-msg_info "Restoring conf.yml"
-cd ~
-cp -R conf.yml /dashy/public
-msg_ok "Restored conf.yml"
-
-msg_info "Cleaning"
-rm -rf conf.yml
-msg_ok "Cleaned"
-
-msg_info "Starting Dashy"
-systemctl start dashy
-msg_ok "Started Dashy"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/systemd/system/dashy.service ]]; then
- msg_error "No ${APP} Installation Found!"
- exit
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
- ${BL}http://${IP}:4000${CL} \n"
diff --git a/ct/dashy.sh b/ct/dashy.sh
new file mode 100644
index 00000000..87312e05
--- /dev/null
+++ b/ct/dashy.sh
@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ ____ __
+ / __ \____ ______/ /_ __ __
+ / / / / __ / ___/ __ \/ / / /
+ / /_/ / /_/ (__ ) / / / /_/ /
+/_____/\__,_/____/_/ /_/\__, /
+ /____/
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Dashy"
+var_disk="6"
+var_cpu="2"
+var_ram="2048"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="1"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Stopping ${APP}"
+systemctl stop dashy
+msg_ok "Stopped ${APP}"
+
+msg_info "Backing up conf.yml"
+cd ~
+cp -R /dashy/public/conf.yml conf.yml
+msg_ok "Backed up conf.yml"
+
+msg_info "Updating Dashy"
+cd /dashy
+git merge &>/dev/null
+git pull origin master &>/dev/null
+yarn &>/dev/null
+yarn build &>/dev/null
+msg_ok "Updated Dashy"
+
+msg_info "Restoring conf.yml"
+cd ~
+cp -R conf.yml /dashy/public
+msg_ok "Restored conf.yml"
+
+msg_info "Cleaning"
+rm -rf conf.yml
+msg_ok "Cleaned"
+
+msg_info "Starting Dashy"
+systemctl start dashy
+msg_ok "Started Dashy"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+ ${BL}http://${IP}:4000${CL} \n"
diff --git a/ct/debian.sh b/ct/debian.sh
index 9fdac351..861cdf5e 100644
--- a/ct/debian.sh
+++ b/ct/debian.sh
@@ -63,4 +63,5 @@ exit
start
build_container
description
+
msg_ok "Completed Successfully!\n"
\ No newline at end of file
diff --git a/ct/deconz-v5.sh b/ct/deconz-v5.sh
deleted file mode 100644
index cdeb7a75..00000000
--- a/ct/deconz-v5.sh
+++ /dev/null
@@ -1,442 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
- __ __________ _ _______
- ____/ /v5 / ____/ __ \/ | / /__ /
- / __ / _ \/ / / / / / |/ / / /
-/ /_/ / __/ /___/ /_/ / /| / / /__
-\__,_/\___/\____/\____/_/ |_/ /____/
-
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="deCONZ"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
- echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
- echo -e "Requires PVE Version 7.0 or higher"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
- echo -e "\n ${CROSS} This script will not work with PiMox! \n"
- echo -e "Exiting..."
- sleep 2
-exit
-fi
-}
-
-function default_settings() {
- echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
- echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
- CT_TYPE="0"
- echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
- PW=""
- echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
- CT_ID=$NEXTID
- echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
- HN=$NSAPP
- echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
- BRG="vmbr0"
- echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
- NET=dhcp
- echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
- GATE=""
- echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
- DISABLEIP6="no"
- echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
- MTU=""
- echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
- SD=""
- echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
- NS=""
- echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
- MAC=""
- echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
- VLAN=""
- echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
- SSH="no"
- echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
- VERB="no"
- echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
- clear
- echo -e "⚠ User exited script \n"
- exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
- "1" "Unprivileged" ON \
- "0" "Privileged" OFF \
- 3>&1 1>&2 2>&3); then
- echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
- exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
- if [ -z $PW1 ]; then
- PW1="Automatic Login"
- PW=" "
- else
- PW="-password $PW1"
- fi
- echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
- exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_ID" ]; then
- CT_ID="$NEXTID"
- echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
- else
- echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
- fi
-else
- exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
- if [ -z "$CT_NAME" ]; then
- HN="$NSAPP"
- else
- HN=$(echo ${CT_NAME,,} | tr -d ' ')
- fi
- echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
- exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
- if [ -z "$DISK_SIZE" ]; then
- DISK_SIZE="$var_disk"
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- else
- if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
- echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
- advanced_settings
- fi
- echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
- if [ -z "$CORE_COUNT" ]; then
- CORE_COUNT="$var_cpu"
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- else
- echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
- fi
-else
- exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
- if [ -z "$RAM_SIZE" ]; then
- RAM_SIZE="$var_ram"
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- else
- echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
- fi
-else
- exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
- if [ -z "$BRG" ]; then
- BRG="vmbr0"
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- else
- echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
- fi
-else
- exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $NET ]; then
- NET="dhcp"
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- else
- echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
- fi
-else
- exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
- if [ -z $GATE1 ]; then
- GATE1="Default"
- GATE=""
- else
- GATE=",gw=$GATE1"
- fi
- echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
- DISABLEIP6="yes"
-else
- DISABLEIP6="no"
-fi
- echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
- if [ -z $MTU1 ]; then
- MTU1="Default"
- MTU=""
- else
- MTU=",mtu=$MTU1"
- fi
- echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
- exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
- if [ -z $SD ]; then
- SX=Host
- SD=""
- else
- SX=$SD
- SD="-searchdomain=$SD"
- fi
- echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
- exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
- if [ -z $NX ]; then
- NX=Host
- NS=""
- else
- NS="-nameserver=$NX"
- fi
- echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
- exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
- if [ -z $MAC1 ]; then
- MAC1="Default"
- MAC=""
- else
- MAC=",hwaddr=$MAC1"
- echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
- fi
-else
- exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
- if [ -z $VLAN1 ]; then
- VLAN1="Default"
- VLAN=""
- else
- VLAN=",tag=$VLAN1"
- fi
- echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
- exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
- SSH="yes"
-else
- SSH="no"
-fi
- echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
- VERB="yes"
-else
- VERB="no"
-fi
- echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
- echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
- clear
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
- if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
- header_info
- echo -e "${BL}Using Default Settings${CL}"
- default_settings
- else
- header_info
- echo -e "${RD}Using Advanced Settings${CL}"
- advanced_settings
- fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP} LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated ${APP} LXC"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/apt/sources.list.d/deconz.list ]]; then
- msg_error "No ${APP} Installation Found!"
- exit
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
- if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
- clear
- echo -e "⚠ User exited script \n"
- exit
- fi
- update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
- FEATURES="nesting=1,keyctl=1"
-else
- FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
- -features $FEATURES
- -hostname $HN
- $SD
- $NS
- -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
- -onboot 1
- -cores $CORE_COUNT
- -memory $RAM_SIZE
- -unprivileged $CT_TYPE
- $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
- LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
- cat <>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id dev/serial/by-id none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0 dev/ttyUSB0 none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1 dev/ttyUSB1 none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0 dev/ttyACM0 none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1 dev/ttyACM1 none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-
"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
- ${BL}http://${IP}${CL}\n"
diff --git a/ct/deconz.sh b/ct/deconz.sh
new file mode 100644
index 00000000..8f96f6cf
--- /dev/null
+++ b/ct/deconz.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/ubuntu.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+ __ __________ _ _______
+ ____/ /__ / ____/ __ \/ | / /__ /
+ / __ / _ \/ / / / / / |/ / / /
+/ /_/ / __/ /___/ /_/ / /| / / /__
+\__,_/\___/\____/\____/_/ |_/ /____/
+
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="deCONZ"
+var_disk="4"
+var_cpu="2"
+var_ram="1024"
+var_os="ubuntu"
+var_version="20.04"
+varibles
+color
+catch_errors
+
+function default_settings() {
+ CT_TYPE="0"
+ PW=""
+ CT_ID=$NEXTID
+ HN=$NSAPP
+ DISK_SIZE="$var_disk"
+ CORE_COUNT="$var_cpu"
+ RAM_SIZE="$var_ram"
+ BRG="vmbr0"
+ NET=dhcp
+ GATE=""
+ DISABLEIP6="no"
+ MTU=""
+ SD=""
+ NS=""
+ MAC=""
+ VLAN=""
+ SSH="no"
+ VERB="no"
+ echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+ ${BL}http://${IP}${CL}\n"
diff --git a/ct/docker.sh b/ct/docker.sh
index e35b9f1a..e9bba280 100644
--- a/ct/docker.sh
+++ b/ct/docker.sh
@@ -64,4 +64,5 @@ exit
start
build_container
description
+
msg_ok "Completed Successfully!\n"
diff --git a/ct/umbrel.sh b/ct/umbrel.sh
index 38727fb3..ada8b0fd 100644
--- a/ct/umbrel.sh
+++ b/ct/umbrel.sh
@@ -64,6 +64,7 @@ exit
start
build_container
description
+
msg_ok "Completed Successfully!\n"
echo -e "${APP} should be reachable by going to the following URL (reboot is required before apps install).
${BL}http://${IP} ${CL} \n"
diff --git a/install/audiobookshelf-install.sh b/install/audiobookshelf-install.sh
new file mode 100644
index 00000000..5586918e
--- /dev/null
+++ b/install/audiobookshelf-install.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y gnupg
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+msg_info "Installing audiobookshelf"
+$STD apt-key add <(curl -s --compressed "https://advplyr.github.io/audiobookshelf-ppa/KEY.gpg")
+sh -c 'echo "deb https://advplyr.github.io/audiobookshelf-ppa ./" > /etc/apt/sources.list.d/audiobookshelf.list'
+$STD apt-get update
+$STD apt install audiobookshelf
+msg_ok "Installed audiobookshelf"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/audiobookshelf-v5-install.sh b/install/audiobookshelf-v5-install.sh
deleted file mode 100644
index f32761b2..00000000
--- a/install/audiobookshelf-v5-install.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y gnupg
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-msg_info "Installing audiobookshelf"
-$STD apt-key add <(curl -s --compressed "https://advplyr.github.io/audiobookshelf-ppa/KEY.gpg")
-sh -c 'echo "deb https://advplyr.github.io/audiobookshelf-ppa ./" > /etc/apt/sources.list.d/audiobookshelf.list'
-$STD apt-get update
-$STD apt install audiobookshelf
-msg_ok "Installed audiobookshelf"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/autobrr-install.sh b/install/autobrr-install.sh
new file mode 100644
index 00000000..dbf1cea3
--- /dev/null
+++ b/install/autobrr-install.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Autobrr"
+wget -q $(curl -s https://api.github.com/repos/autobrr/autobrr/releases/latest | grep download | grep linux_x86_64 | cut -d\" -f4)
+tar -C /usr/local/bin -xzf autobrr*.tar.gz
+rm -rf autobrr*.tar.gz
+mkdir -p /root/.config/autobrr
+cat <>/root/.config/autobrr/config.toml
+# https://autobrr.com/configuration/autobrr
+host = "0.0.0.0"
+port = 7474
+logLevel = "DEBUG"
+sessionSecret = "$(openssl rand -base64 24)"
+EOF
+msg_ok "Installed Autobrr"
+
+msg_info "Creating Service"
+service_path="/etc/systemd/system/autobrr.service"
+echo "[Unit]
+Description=autobrr service
+After=syslog.target network-online.target
+[Service]
+Type=simple
+User=root
+Group=root
+ExecStart=/usr/local/bin/autobrr --config=/root/.config/autobrr/
+[Install]
+WantedBy=multi-user.target" >$service_path
+systemctl enable --now -q autobrr.service
+msg_ok "Created Service"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/autobrr-v5-install.sh b/install/autobrr-v5-install.sh
deleted file mode 100644
index 61a9c8c2..00000000
--- a/install/autobrr-v5-install.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Autobrr"
-wget -q $(curl -s https://api.github.com/repos/autobrr/autobrr/releases/latest | grep download | grep linux_x86_64 | cut -d\" -f4)
-tar -C /usr/local/bin -xzf autobrr*.tar.gz
-rm -rf autobrr*.tar.gz
-mkdir -p /root/.config/autobrr
-cat <>/root/.config/autobrr/config.toml
-# https://autobrr.com/configuration/autobrr
-host = "0.0.0.0"
-port = 7474
-logLevel = "DEBUG"
-sessionSecret = "$(openssl rand -base64 24)"
-EOF
-msg_ok "Installed Autobrr"
-
-msg_info "Creating Service"
-service_path="/etc/systemd/system/autobrr.service"
-echo "[Unit]
-Description=autobrr service
-After=syslog.target network-online.target
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/usr/local/bin/autobrr --config=/root/.config/autobrr/
-[Install]
-WantedBy=multi-user.target" >$service_path
-systemctl enable --now -q autobrr.service
-msg_ok "Created Service"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/blocky-v5-install.sh b/install/blocky-install.sh
similarity index 79%
rename from install/blocky-v5-install.sh
rename to install/blocky-install.sh
index aa1722b0..e4656a13 100644
--- a/install/blocky-v5-install.sh
+++ b/install/blocky-install.sh
@@ -5,85 +5,13 @@
# License: MIT
# https://github.com/tteck/Proxmox/raw/main/LICENSE
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
msg_info "Installing Dependencies"
$STD apt-get install -y curl
@@ -353,23 +281,8 @@ EOF
$STD systemctl enable --now blocky
msg_ok "Created Service"
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
+motd_ssh
+root
msg_info "Cleaning up"
$STD apt-get autoremove
diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh
new file mode 100644
index 00000000..fc9832c7
--- /dev/null
+++ b/install/changedetection-install.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y pip
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Change Detection"
+mkdir /opt/changedetection
+$STD pip3 install changedetection.io
+$STD python3 -m pip install dnspython==2.2.1
+msg_ok "Installed Change Detection"
+
+msg_info "Creating Service"
+cat </etc/systemd/system/changedetection.service
+[Unit]
+Description=Change Detection
+After=network-online.target
+[Service]
+Type=simple
+WorkingDirectory=/opt/changedetection
+ExecStart=changedetection.io -d /opt/changedetection -p 5000
+[Install]
+WantedBy=multi-user.target
+EOF
+$STD systemctl enable --now changedetection
+msg_ok "Created Service"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/changedetection-v5-install.sh b/install/changedetection-v5-install.sh
deleted file mode 100644
index 433ee0f9..00000000
--- a/install/changedetection-v5-install.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y pip
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Change Detection"
-mkdir /opt/changedetection
-$STD pip3 install changedetection.io
-$STD python3 -m pip install dnspython==2.2.1
-msg_ok "Installed Change Detection"
-
-msg_info "Creating Service"
-cat </etc/systemd/system/changedetection.service
-[Unit]
-Description=Change Detection
-After=network-online.target
-[Service]
-Type=simple
-WorkingDirectory=/opt/changedetection
-ExecStart=changedetection.io -d /opt/changedetection -p 5000
-[Install]
-WantedBy=multi-user.target
-EOF
-$STD systemctl enable --now changedetection
-msg_ok "Created Service"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/cronicle-install.sh b/install/cronicle-install.sh
new file mode 100644
index 00000000..1060a494
--- /dev/null
+++ b/install/cronicle-install.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y git
+$STD apt-get install -y make
+$STD apt-get install -y g++
+$STD apt-get install -y gcc
+msg_ok "Installed Dependencies"
+
+msg_info "Setting up Node.js Repository"
+$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x)
+msg_ok "Set up Node.js Repository"
+
+msg_info "Installing Node.js"
+$STD apt-get install -y nodejs
+msg_ok "Installed Node.js"
+
+msg_info "Installing Cronicle Primary Server"
+LATEST=$(curl -sL https://api.github.com/repos/jhuckaby/Cronicle/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
+IP=$(hostname -I | awk '{print $1}')
+mkdir -p /opt/cronicle
+cd /opt/cronicle
+$STD tar zxvf <(curl -fsSL https://github.com/jhuckaby/Cronicle/archive/${LATEST}.tar.gz) --strip-components 1
+$STD npm install
+$STD node bin/build.js dist
+sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json
+if [[ $SERV == "y" ]]; then $STD /opt/cronicle/bin/control.sh setup; fi
+$STD /opt/cronicle/bin/control.sh start
+$STD cp /opt/cronicle/bin/cronicled.init /etc/init.d/cronicled
+chmod 775 /etc/init.d/cronicled
+$STD update-rc.d cronicled defaults
+msg_ok "Installed Cronicle Primary Server"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/cronicle-v5-install.sh b/install/cronicle-v5-install.sh
deleted file mode 100644
index d9addbf6..00000000
--- a/install/cronicle-v5-install.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y git
-$STD apt-get install -y make
-$STD apt-get install -y g++
-$STD apt-get install -y gcc
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up Node.js Repository"
-$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x)
-msg_ok "Set up Node.js Repository"
-
-msg_info "Installing Node.js"
-$STD apt-get install -y nodejs
-msg_ok "Installed Node.js"
-
-msg_info "Installing Cronicle Primary Server"
-LATEST=$(curl -sL https://api.github.com/repos/jhuckaby/Cronicle/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
-IP=$(hostname -I | awk '{print $1}')
-mkdir -p /opt/cronicle
-cd /opt/cronicle
-$STD tar zxvf <(curl -fsSL https://github.com/jhuckaby/Cronicle/archive/${LATEST}.tar.gz) --strip-components 1
-$STD npm install
-$STD node bin/build.js dist
-sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json
-if [[ $SERV == "y" ]]; then $STD /opt/cronicle/bin/control.sh setup; fi
-$STD /opt/cronicle/bin/control.sh start
-$STD cp /opt/cronicle/bin/cronicled.init /etc/init.d/cronicled
-chmod 775 /etc/init.d/cronicled
-$STD update-rc.d cronicled defaults
-msg_ok "Installed Cronicle Primary Server"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/daemonsync-install.sh b/install/daemonsync-install.sh
new file mode 100644
index 00000000..dead1801
--- /dev/null
+++ b/install/daemonsync-install.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y g++-multilib
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Daemon Sync Server"
+wget -qL https://github.com/tteck/Proxmox/raw/main/misc/daemonsync_2.2.0.0059_amd64.deb
+$STD dpkg -i daemonsync_2.2.0.0059_amd64.deb
+msg_ok "Installed Daemon Sync Server"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+rm -rf daemonsync_2.2.0.0059_amd64.deb
+$STD apt-get autoremove >/dev/null
+$STD apt-get autoclean >/dev/null
+msg_ok "Cleaned"
diff --git a/install/daemonsync-v5-install.sh b/install/daemonsync-v5-install.sh
deleted file mode 100644
index abe4dec6..00000000
--- a/install/daemonsync-v5-install.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y g++-multilib
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Daemon Sync Server"
-wget -qL https://github.com/tteck/Proxmox/raw/main/misc/daemonsync_2.2.0.0059_amd64.deb
-$STD dpkg -i daemonsync_2.2.0.0059_amd64.deb
-msg_ok "Installed Daemon Sync Server"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-rm -rf daemonsync_2.2.0.0059_amd64.deb
-$STD apt-get autoremove >/dev/null
-$STD apt-get autoclean >/dev/null
-msg_ok "Cleaned"
diff --git a/install/dashy-install.sh b/install/dashy-install.sh
new file mode 100644
index 00000000..089fcdde
--- /dev/null
+++ b/install/dashy-install.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y git
+msg_ok "Installed Dependencies"
+
+msg_info "Setting up Node.js Repository"
+$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x)
+msg_ok "Set up Node.js Repository"
+
+msg_info "Installing Node.js"
+$STD apt-get install -y nodejs git make g++ gcc
+msg_ok "Installed Node.js"
+
+msg_info "Installing Yarn"
+$STD npm install --global yarn
+msg_ok "Installed Yarn"
+
+msg_info "Installing Dashy (Patience)"
+$STD git clone https://github.com/Lissy93/dashy.git
+cd /dashy
+$STD yarn
+export NODE_OPTIONS=--max-old-space-size=1000
+$STD yarn build
+msg_ok "Installed Dashy"
+
+msg_info "Creating Service"
+cat </etc/systemd/system/dashy.service
+[Unit]
+Description=dashy
+
+[Service]
+Type=simple
+WorkingDirectory=/dashy
+ExecStart=/usr/bin/yarn start
+[Install]
+WantedBy=multi-user.target
+EOF
+$STD systemctl enable dashy
+systemctl start dashy
+msg_ok "Created Service"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/dashy-v5-install.sh b/install/dashy-v5-install.sh
deleted file mode 100644
index 1bd8e71d..00000000
--- a/install/dashy-v5-install.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y git
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up Node.js Repository"
-$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x)
-msg_ok "Set up Node.js Repository"
-
-msg_info "Installing Node.js"
-$STD apt-get install -y nodejs git make g++ gcc
-msg_ok "Installed Node.js"
-
-msg_info "Installing Yarn"
-$STD npm install --global yarn
-msg_ok "Installed Yarn"
-
-msg_info "Installing Dashy (Patience)"
-$STD git clone https://github.com/Lissy93/dashy.git
-cd /dashy
-$STD yarn
-export NODE_OPTIONS=--max-old-space-size=1000
-$STD yarn build
-msg_ok "Installed Dashy"
-
-msg_info "Creating Service"
-cat </etc/systemd/system/dashy.service
-[Unit]
-Description=dashy
-
-[Service]
-Type=simple
-WorkingDirectory=/dashy
-ExecStart=/usr/bin/yarn start
-[Install]
-WantedBy=multi-user.target
-EOF
-$STD systemctl enable dashy
-systemctl start dashy
-msg_ok "Created Service"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/deconz-install.sh b/install/deconz-install.sh
new file mode 100644
index 00000000..068cf5f3
--- /dev/null
+++ b/install/deconz-install.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y gnupg
+msg_ok "Installed Dependencies"
+
+msg_info "Setting Phoscon Repository"
+$STD apt-key add <(curl -fsSL http://phoscon.de/apt/deconz.pub.key)
+sh -c "echo 'deb [arch=amd64] http://phoscon.de/apt/deconz $(lsb_release -cs) main' > /etc/apt/sources.list.d/deconz.list"
+msg_ok "Setup Phoscon Repository"
+
+msg_info "Installing deConz"
+$STD apt-get update
+$STD apt-get install -y deconz
+msg_ok "Installed deConz"
+
+msg_info "Creating Service"
+service_path="/lib/systemd/system/deconz.service"
+echo "[Unit]
+Description=deCONZ: ZigBee gateway -- REST API
+Wants=deconz-init.service deconz-update.service
+StartLimitIntervalSec=0
+
+[Service]
+User=root
+ExecStart=/usr/bin/deCONZ -platform minimal --http-port=80
+Restart=on-failure
+RestartSec=30
+AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_KILL CAP_SYS_BOOT CAP_SYS_TIME
+
+[Install]
+WantedBy=multi-user.target" >$service_path
+$STD systemctl enable --now deconz
+msg_ok "Created Service"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/deconz-v5-install.sh b/install/deconz-v5-install.sh
deleted file mode 100644
index ad060379..00000000
--- a/install/deconz-v5-install.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
- local exit_code="$?"
- local line_number="$1"
- local command="$2"
- local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
- echo -e "\n$error_message\n"
-}
-
-function msg_info() {
- local msg="$1"
- echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
- local msg="$1"
- echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
- local msg="$1"
- echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
- if [ "$(hostname -I)" != "" ]; then
- break
- fi
- echo 1>&2 -en "${CROSS}${RD} No Network! "
- sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
- echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
- echo -e " 🖧 Check Network Settings"
- exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
- msg_error "Internet NOT Connected"
- read -r -p "Would you like to continue anyway? " prompt
- if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
- echo -e " ⚠️ ${RD}Expect Issues Without Internet${CL}"
- else
- echo -e " 🖧 Check Network Settings"
- exit 1
- fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y gnupg
-msg_ok "Installed Dependencies"
-
-msg_info "Setting Phoscon Repository"
-$STD apt-key add <(curl -fsSL http://phoscon.de/apt/deconz.pub.key)
-sh -c "echo 'deb [arch=amd64] http://phoscon.de/apt/deconz $(lsb_release -cs) main' > /etc/apt/sources.list.d/deconz.list"
-msg_ok "Setup Phoscon Repository"
-
-msg_info "Installing deConz"
-$STD apt-get update
-$STD apt-get install -y deconz
-msg_ok "Installed deConz"
-
-msg_info "Creating Service"
-service_path="/lib/systemd/system/deconz.service"
-echo "[Unit]
-Description=deCONZ: ZigBee gateway -- REST API
-Wants=deconz-init.service deconz-update.service
-StartLimitIntervalSec=0
-
-[Service]
-User=root
-ExecStart=/usr/bin/deCONZ -platform minimal --http-port=80
-Restart=on-failure
-RestartSec=30
-AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_KILL CAP_SYS_BOOT CAP_SYS_TIME
-
-[Install]
-WantedBy=multi-user.target" >$service_path
-$STD systemctl enable --now deconz
-msg_ok "Created Service"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
- msg_info "Customizing Container"
- GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
- mkdir -p $(dirname $GETTY_OVERRIDE)
- cat <$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
- systemctl daemon-reload
- systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
- msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/misc/debian.func b/misc/debian.func
index e98f891f..643d4e5b 100644
--- a/misc/debian.func
+++ b/misc/debian.func
@@ -67,7 +67,7 @@ arch_check() {
}
echo_default() {
- echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
+ echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
diff --git a/misc/ubuntu.func b/misc/ubuntu.func
index e69de29b..4f7738c1 100644
--- a/misc/ubuntu.func
+++ b/misc/ubuntu.func
@@ -0,0 +1,409 @@
+varibles() {
+ NSAPP=$(echo ${APP,,} | tr -d ' ')
+ var_install="${NSAPP}-install"
+ timezone=$(cat /etc/timezone)
+ INTEGER='^[0-9]+([.][0-9]+)?$'
+}
+
+color() {
+ YW=$(echo "\033[33m")
+ BL=$(echo "\033[36m")
+ RD=$(echo "\033[01;31m")
+ BGN=$(echo "\033[4;92m")
+ GN=$(echo "\033[1;92m")
+ DGN=$(echo "\033[32m")
+ CL=$(echo "\033[m")
+ CM="${GN}✓${CL}"
+ CROSS="${RD}✗${CL}"
+ BFR="\\r\\033[K"
+ HOLD="-"
+}
+
+catch_errors() {
+ set -Eeuo pipefail
+ trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+}
+
+error_handler() {
+ local exit_code="$?"
+ local line_number="$1"
+ local command="$2"
+ local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+ echo -e "\n$error_message\n"
+}
+
+msg_info() {
+ local msg="$1"
+ echo -ne " ${HOLD} ${YW}${msg}..."
+}
+
+msg_ok() {
+ local msg="$1"
+ echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
+}
+
+msg_error() {
+ local msg="$1"
+ echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
+}
+
+pve_check() {
+ if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
+ echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
+ echo -e "Requires PVE Version 7.0 or higher"
+ echo -e "Exiting..."
+ sleep 2
+ exit
+ fi
+}
+
+arch_check() {
+ if [ "$(dpkg --print-architecture)" != "amd64" ]; then
+ echo -e "\n ${CROSS} This script will not work with PiMox! \n"
+ echo -e "Exiting..."
+ sleep 2
+ exit
+ fi
+}
+
+echo_default() {
+ echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
+ echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
+ echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
+ echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
+ echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
+ echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
+ echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
+ echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
+ echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
+ echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
+ echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
+ echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
+ echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
+ echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
+ echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
+ echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
+ echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
+ echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
+ echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
+}
+
+function exit-script() {
+ clear
+ echo -e "⚠ User exited script \n"
+ exit
+}
+
+function advanced_settings() {
+ if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+ "18.04" "Bionic" OFF \
+ "20.04" "Focal" ON \
+ "22.04" "Jammy" OFF \
+ "22.10" "Kinetic" OFF \
+ 3>&1 1>&2 2>&3); then
+ echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
+ else
+ exit-script
+ fi
+
+ if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+ "1" "Unprivileged" ON \
+ "0" "Privileged" OFF \
+ 3>&1 1>&2 2>&3); then
+ echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
+ else
+ exit-script
+ fi
+
+ if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
+ if [ -z $PW1 ]; then
+ PW1="Automatic Login"
+ PW=" "
+ else
+ PW="-password $PW1"
+ fi
+ echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
+ else
+ exit-script
+ fi
+
+ if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
+ if [ -z "$CT_ID" ]; then
+ CT_ID="$NEXTID"
+ echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
+ else
+ echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
+ fi
+ else
+ exit
+ fi
+
+ if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
+ if [ -z "$CT_NAME" ]; then
+ HN="$NSAPP"
+ else
+ HN=$(echo ${CT_NAME,,} | tr -d ' ')
+ fi
+ echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
+ else
+ exit-script
+ fi
+
+ if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
+ if [ -z "$DISK_SIZE" ]; then
+ DISK_SIZE="$var_disk"
+ echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+ else
+ if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
+ echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
+ advanced_settings
+ fi
+ echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
+ fi
+ else
+ exit-script
+ fi
+
+ if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
+ if [ -z "$CORE_COUNT" ]; then
+ CORE_COUNT="$var_cpu"
+ echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+ else
+ echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
+ fi
+ else
+ exit-script
+ fi
+
+ if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
+ if [ -z "$RAM_SIZE" ]; then
+ RAM_SIZE="$var_ram"
+ echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+ else
+ echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
+ fi
+ else
+ exit-script
+ fi
+
+ if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
+ if [ -z "$BRG" ]; then
+ BRG="vmbr0"
+ echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+ else
+ echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
+ fi
+ else
+ exit-script
+ fi
+
+ if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
+ if [ -z $NET ]; then
+ NET="dhcp"
+ echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+ else
+ echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
+ fi
+ else
+ exit-script
+ fi
+
+ if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
+ if [ -z $GATE1 ]; then
+ GATE1="Default"
+ GATE=""
+ else
+ GATE=",gw=$GATE1"
+ fi
+ echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
+ else
+ exit-script
+ fi
+
+ if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
+ DISABLEIP6="yes"
+ else
+ DISABLEIP6="no"
+ fi
+ echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
+
+ if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
+ if [ -z $MTU1 ]; then
+ MTU1="Default"
+ MTU=""
+ else
+ MTU=",mtu=$MTU1"
+ fi
+ echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
+ else
+ exit-script
+ fi
+
+ if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
+ if [ -z $SD ]; then
+ SX=Host
+ SD=""
+ else
+ SX=$SD
+ SD="-searchdomain=$SD"
+ fi
+ echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
+ else
+ exit-script
+ fi
+
+ if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
+ if [ -z $NX ]; then
+ NX=Host
+ NS=""
+ else
+ NS="-nameserver=$NX"
+ fi
+ echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
+ else
+ exit-script
+ fi
+
+ if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
+ if [ -z $MAC1 ]; then
+ MAC1="Default"
+ MAC=""
+ else
+ MAC=",hwaddr=$MAC1"
+ echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
+ fi
+ else
+ exit-script
+ fi
+
+ if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
+ if [ -z $VLAN1 ]; then
+ VLAN1="Default"
+ VLAN=""
+ else
+ VLAN=",tag=$VLAN1"
+ fi
+ echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
+ else
+ exit-script
+ fi
+
+ if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
+ SSH="yes"
+ else
+ SSH="no"
+ fi
+ echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
+
+ if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
+ VERB="yes"
+ else
+ VERB="no"
+ fi
+ echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
+
+ if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
+ echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
+ else
+ clear
+ header_info
+ echo -e "${RD}Using Advanced Settings${CL}"
+ advanced_settings
+ fi
+}
+
+function install_script() {
+ arch_check
+ pve_check
+ NEXTID=$(pvesh get /cluster/nextid)
+ header_info
+ if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
+ header_info
+ echo -e "${BL}Using Default Settings${CL}"
+ default_settings
+ else
+ header_info
+ echo -e "${RD}Using Advanced Settings${CL}"
+ advanced_settings
+ fi
+}
+
+start() {
+ if command -v pveversion >/dev/null 2>&1; then
+ if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
+ clear
+ echo -e "⚠ User exited script \n"
+ exit
+ fi
+ install_script
+ fi
+
+ if ! command -v pveversion >/dev/null 2>&1; then
+ if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
+ clear
+ echo -e "⚠ User exited script \n"
+ exit
+ fi
+ update_script
+ fi
+}
+
+build_container() {
+ if [ "$VERB" == "yes" ]; then set -x; fi
+ if [ "$CT_TYPE" == "1" ]; then
+ FEATURES="nesting=1,keyctl=1"
+ else
+ FEATURES="nesting=1"
+ fi
+ TEMP_DIR=$(mktemp -d)
+ pushd $TEMP_DIR >/dev/null
+ export FUNCTIONS_FILE_PATH=$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/install.func)
+ export tz=$timezone
+ export DISABLEIPV6=$DISABLEIP6
+ export APPLICATION=$APP
+ export VERBOSE=$VERB
+ export SSH_ROOT=${SSH}
+ export CTID=$CT_ID
+ export PCT_OSTYPE=$var_os
+ export PCT_OSVERSION=$var_version
+ export PCT_DISK_SIZE=$DISK_SIZE
+ export PCT_OPTIONS="
+ -features $FEATURES
+ -hostname $HN
+ $SD
+ $NS
+ -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
+ -onboot 1
+ -cores $CORE_COUNT
+ -memory $RAM_SIZE
+ -unprivileged $CT_TYPE
+ $PW
+ "
+ bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
+if [ "$CT_TYPE" == "0" ]; then
+LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
+cat <>$LXC_CONFIG
+lxc.cgroup2.devices.allow: a
+lxc.cap.drop:
+lxc.cgroup2.devices.allow: c 188:* rwm
+lxc.cgroup2.devices.allow: c 189:* rwm
+lxc.mount.entry: /dev/serial/by-id dev/serial/by-id none bind,optional,create=dir
+lxc.mount.entry: /dev/ttyUSB0 dev/ttyUSB0 none bind,optional,create=file
+lxc.mount.entry: /dev/ttyUSB1 dev/ttyUSB1 none bind,optional,create=file
+lxc.mount.entry: /dev/ttyACM0 dev/ttyACM0 none bind,optional,create=file
+lxc.mount.entry: /dev/ttyACM1 dev/ttyACM1 none bind,optional,create=file
+EOF
+fi
+ msg_info "Starting LXC Container"
+ pct start $CTID
+ msg_ok "Started LXC Container"
+ lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/next/install/$var_install.sh)" || exit
+
+}
+
+description() {
+ IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
+ pct set $CTID -description "# ${APP} LXC
+ ### https://tteck.github.io/Proxmox/
+
"
+}
\ No newline at end of file