Update ALL CT's to new default (Part 2) (#710)

* Update ALL CT's to new default

* Minor Changes

* Merge Bookstack from main

* Indention Bookstack

* Merge Vikunja from Main

* Merge Komga from Main

* Merge Unifi from Main

ct/zabbix.sh

@@ -2,88 +2,63 @@
 source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
 # Copyright (c) 2021-2024 tteck
 # Author: tteck (tteckster)
-# License: MIT
-# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://www.zabbix.com/
 
-function header_info {
-clear
-cat <<"EOF"
- _____         __    __    _
-/__  /  ____ _/ /_  / /_  (_)  __
-  / /  / __ `/ __ \/ __ \/ / |/_/
- / /__/ /_/ / /_/ / /_/ / />  <
-/____/\__,_/_.___/_.___/_/_/|_|
-
-EOF
-}
-header_info
-echo -e "Loading..."
+# App Default Values
 APP="Zabbix"
-var_disk="6"
+TAGS="monitoring"
 var_cpu="2"
 var_ram="4096"
+var_disk="6"
 var_os="debian"
 var_version="12"
+var_unprivileged="1"
+
+# App Output & Base Settings
+header_info "$APP"
+base_settings
+
+# Core
 variables
 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=""
-  APT_CACHER=""
-  APT_CACHER_IP=""
-  DISABLEIP6="no"
-  MTU=""
-  SD=""
-  NS=""
-  MAC=""
-  VLAN=""
-  SSH="no"
-  VERB="no"
-  echo_default
-}
-
 function update_script() {
-header_info
-check_container_storage
-check_container_resources
-if [[ ! -f /etc/zabbix/zabbix_server.conf ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-msg_info "Stopping ${APP} Services"
-systemctl stop zabbix-server zabbix-agent2
-msg_ok "Stopped ${APP} Services"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -f /etc/zabbix/zabbix_server.conf ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Stopping ${APP} Services"
+    systemctl stop zabbix-server zabbix-agent2
+    msg_ok "Stopped ${APP} Services"
 
-msg_info "Updating $APP LXC"
-mkdir -p /opt/zabbix-backup/
-cp /etc/zabbix/zabbix_server.conf /opt/zabbix-backup/
-cp /etc/apache2/conf-enabled/zabbix.conf /opt/zabbix-backup/
-cp -R /usr/share/zabbix/ /opt/zabbix-backup/
-cp -R /usr/share/zabbix-* /opt/zabbix-backup/
-rm -Rf /etc/apt/sources.list.d/zabbix.list
-cd /tmp
-wget -q https://repo.zabbix.com/zabbix/7.0/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian12_all.deb
-dpkg -i zabbix-release_latest+debian12_all.deb &>/dev/null
-apt-get update &>/dev/null
-apt-get install --only-upgrade zabbix-server-pgsql zabbix-frontend-php zabbix-agent2 zabbix-agent2-plugin-* &>/dev/null
+    msg_info "Updating $APP LXC"
+    mkdir -p /opt/zabbix-backup/
+    cp /etc/zabbix/zabbix_server.conf /opt/zabbix-backup/
+    cp /etc/apache2/conf-enabled/zabbix.conf /opt/zabbix-backup/
+    cp -R /usr/share/zabbix/ /opt/zabbix-backup/
+    cp -R /usr/share/zabbix-* /opt/zabbix-backup/
+    rm -Rf /etc/apt/sources.list.d/zabbix.list
+    cd /tmp
+    wget -q https://repo.zabbix.com/zabbix/7.0/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian12_all.deb
+    dpkg -i zabbix-release_latest+debian12_all.deb &>/dev/null
+    apt-get update &>/dev/null
+    apt-get install --only-upgrade zabbix-server-pgsql zabbix-frontend-php zabbix-agent2 zabbix-agent2-plugin-* &>/dev/null
 
-msg_info "Starting ${APP} Services"
-systemctl start zabbix-server zabbix-agent2
-systemctl restart apache2
-msg_ok "Started ${APP} Services"
+    msg_info "Starting ${APP} Services"
+    systemctl start zabbix-server zabbix-agent2
+    systemctl restart apache2
+    msg_ok "Started ${APP} Services"
 
-msg_info "Cleaning Up"
-rm -rf /tmp/zabbix-release_latest+debian12_all.deb
-msg_ok "Cleaned"
-msg_ok "Updated Successfully"
-exit
+    msg_info "Cleaning Up"
+    rm -rf /tmp/zabbix-release_latest+debian12_all.deb
+    msg_ok "Cleaned"
+    msg_ok "Updated Successfully"
+    exit
 }
 
 start
@@ -91,5 +66,6 @@ build_container
 description
 
 msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}/zabbix${CL} \n"
+echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
+echo -e "${INFO}${YW} Access it using the following URL:${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}/zabbix${CL}"