Merge dcec2605a4 into 4dcf0dc0b8

Update CHANGELOG.md (#1617 )
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2025-02-04 06:50:15 +00:00 · 2025-01-20 19:00:24 +01:00 · 2025-01-20 18:04:18 +01:00 · 2025-01-20 18:03:27 +01:00 · 2025-01-20 17:25:02 +01:00 · 2025-01-20 16:51:05 +01:00
9 changed files with 347 additions and 69 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -28,7 +28,8 @@ Do not break established syntax in this file, as it is automatically updated by

 ### 🚀 Updated Scripts

- Update Kimai Dependency: Use PHP 8.4  [@MickLesk](https://github.com/MickLesk) ([#1609](https://github.com/community-scripts/ProxmoxVE/pull/1609))
+- Update Kimai Dependency: Use PHP 8.3 [@MickLesk](https://github.com/MickLesk) ([#1609](https://github.com/community-scripts/ProxmoxVE/pull/1609))
+- Feature: Add xCaddy for external Modules on Caddy-LXC [@MickLesk](https://github.com/MickLesk) ([#1613](https://github.com/community-scripts/ProxmoxVE/pull/1613))
 - Fix Pocketbase URL after install [@MickLesk](https://github.com/MickLesk) ([#1597](https://github.com/community-scripts/ProxmoxVE/pull/1597))
 - Unifi.sh fix wrong URL after Install [@thost96](https://github.com/thost96) ([#1601](https://github.com/community-scripts/ProxmoxVE/pull/1601))

@ -39,6 +40,8 @@ Do not break established syntax in this file, as it is automatically updated by

 ### 🧰 Maintenance

+- [core] Update build.func: Add defaults to Advanced mode [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1548](https://github.com/community-scripts/ProxmoxVE/pull/1548))
+- Update build.func: Fix Advanced Tags (Remove all if empty / overwrite if default cleared) [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1612](https://github.com/community-scripts/ProxmoxVE/pull/1612))
 - Add new Check for LXC MaxKeys by @cricalix [@MickLesk](https://github.com/MickLesk) ([#1602](https://github.com/community-scripts/ProxmoxVE/pull/1602))

 ## 2025-01-19
--- a/ct/caddy.sh
+++ b/ct/caddy.sh
@ -10,7 +10,7 @@ APP="Caddy"
 var_tags="webserver"
 var_cpu="1"
 var_ram="512"
-var_disk="2"
+var_disk="4"
 var_os="debian"
 var_version="12"
 var_unprivileged="1"
@ -46,4 +46,4 @@ description
 msg_ok "Completed Successfully!\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}:80${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:80${CL}"
--- a/ct/sqlserver2022.sh
+++ b/ct/sqlserver2022.sh
@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/kris701/ProxmoxVE/refs/heads/main/misc/build.func)
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: Kristian Skov
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://www.microsoft.com/en-us/sql-server/sql-server-2022
+
+# App Default Values
+APP="SQL Server 2022"
+var_tags="sql"
+var_cpu="1"
+var_ram="2048"
+var_disk="10"
+var_os="ubuntu"
+var_version="22.04"
+var_unprivileged="0"
+
+# App Output & Base Settings
+header_info "$APP"
+base_settings
+
+# Core
+variables
+color
+catch_errors
+
+function update_script() {
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /opt/mssql ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Updating ${APP} LXC"
+    apt-get update &>/dev/null
+    apt-get -y upgrade &>/dev/null
+    msg_ok "Updated Successfully"
+    exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
+echo -e "${INFO}${YW} Access it using the following IP:${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}${IP}:1433${CL}"
--- a/install/caddy-install.sh
+++ b/install/caddy-install.sh
@ -1,9 +1,8 @@
 #!/usr/bin/env bash

 # Copyright (c) 2021-2025 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Author: tteck (tteckster) | Co-Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE

 source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
 color
@ -14,7 +13,14 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y {debian-keyring,debian-archive-keyring,apt-transport-https,gpg,curl,sudo,mc}
+$STD apt-get install -y \
+  debian-keyring \
+  debian-archive-keyring \
+  apt-transport-https \
+  gpg \
+  curl \
+  sudo \
+  mc
 msg_ok "Installed Dependencies"

 msg_info "Installing Caddy"
@ -24,6 +30,29 @@ $STD apt-get update
 $STD apt-get install -y caddy
 msg_ok "Installed Caddy"

+read -r -p "Would you like to install xCaddy Addon? <y/N> " prompt
+if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
+  msg_info "Installing Golang"
+  cd /opt
+  set +o pipefail
+  GOLANG=$(curl -s https://go.dev/dl/ | grep -o "go.*\linux-amd64.tar.gz" | head -n 1)
+  wget -q https://golang.org/dl/$GOLANG
+  tar -xzf $GOLANG -C /usr/local
+  ln -s /usr/local/go/bin/go /usr/local/bin/go
+  set -o pipefail
+  rm -rf /opt/go*
+  msg_ok "Installed Golang"
+	
+  msg_info "Setup xCaddy"
+  cd /opt
+  RELEASE=$(curl -s https://api.github.com/repos/caddyserver/xcaddy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+  wget -q https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_amd64.deb
+  $STD dpkg -i xcaddy_${RELEASE:1}_linux_amd64.deb
+  rm -rf /opt/xcaddy*
+  $STD xcaddy build
+  msg_ok "Setup xCaddy"
+fi
+
 motd_ssh
 customize

--- a/install/kimai-install.sh
+++ b/install/kimai-install.sh
@ -27,15 +27,15 @@ $STD apt-get install -y \
  lsb-release
 msg_ok "Installed Dependencies"

-#msg_info "Setup PHP8.4 Repository"
-#$STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
-#$STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
-#$STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-#$STD apt-get update
-#msg_ok "Setup PHP8.4 Repository"
+msg_info "Setup PHP8.4 Repository"
+$STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+$STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
+$STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+$STD apt-get update
+msg_ok "Setup PHP8.4 Repository"

 msg_info "Setup PHP"
-#$STD apt-get remove -y php8.2*
+$STD apt-get remove -y php8.2*
 #$STD apt-get remove -y php8.3*
 $STD apt-get install -y \
  php8.3 \
@ -87,6 +87,7 @@ send "helper-scripts.com\r"

 expect eof
 EOF
+$STD composer update --no-interaction
 echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
 msg_ok "Installed Kimai"

--- a/install/sqlserver2022-install.sh
+++ b/install/sqlserver2022-install.sh
@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: Kristian Skov
+# License: MIT
+# https://github.com/community-scripts/ProxmoxVE/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 install -y \
+	curl \
+	gpg \
+	coreutils
+msg_ok "Installed Dependencies"
+
+msg_info "Installing SQL Server 2022"
+curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg
+curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
+curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list | tee /etc/apt/sources.list.d/mssql-server-2022.list
+$STD apt clean *
+$STD apt update -y
+$STD apt install -y mssql-server
+/opt/mssql/bin/mssql-conf setup
+msg_ok "Installed SQL Server 2022"
+
+msg_info "Installing SQL Server Tools"
+curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
+curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
+$STD apt update
+$STD apt install -y \
+  mssql-tools18 \
+  unixodbc-dev
+echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bash_profile
+source ~/.bash_profile
+msg_ok "Installed SQL Server Tools"
+
+msg_info "Start Service"
+systemctl enable -q mssql-server 
+systemctl start -q mssql-server 
+msg_ok "Service started"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+$STD apt-get -y autoremove
+$STD apt-get -y autoclean
+msg_ok "Cleaned"
--- a/json/caddy.json
+++ b/json/caddy.json
@ -20,7 +20,7 @@
            "resources": {
                "cpu": 1,
                "ram": 512,
-                "hdd": 2,
+                "hdd": 4,
                "os": "debian",
                "version": "12"
            }
@ -30,5 +30,14 @@
        "username": null,
        "password": null
    },
-    "notes": []
-}
+  "notes": [
+    {
+      "text": "if you need an internal module run: `caddy add-package PACKAGENAME`",
+      "type": "info"
+    },
+    {
+      "text": "if you need an external module run: `xcaddy build --with github.com/caddy-dns/cloudflare`",
+      "type": "info"
+    }
+  ]
+}
--- a/json/sqlserver2022.json
+++ b/json/sqlserver2022.json
@ -0,0 +1,43 @@
+{
+   "name":"SQL Server 2022",
+   "slug":"sqlserver2022",
+   "categories":[
+      5
+   ],
+   "date_created":"2025-01-14",
+   "type":"ct",
+   "updateable":true,
+   "privileged":true,
+   "interface_port":1433,
+   "documentation":"https://learn.microsoft.com/en-us/sql/sql-server/?view=sql-server-ver16",
+   "website":"https://www.microsoft.com/en-us/sql-server/sql-server-2022",
+   "logo":"https://www.svgrepo.com/show/303229/microsoft-sql-server-logo.svg",
+   "description":"Script to automatically set up a SQL Server 2022 installation.",
+   "install_methods":[
+      {
+         "type":"default",
+         "script":"ct/sqlserver2022.sh",
+         "resources":{
+            "cpu":1,
+            "ram":2048,
+            "hdd":10,
+            "os":"Ubuntu",
+            "version":"22.04"
+         }
+      }
+   ],
+   "default_credentials":{
+      "username":null,
+      "password":null
+   },
+   "notes":[
+      {
+         "text":"You can setup the admin account 'SA' during installation",
+         "type":"info"
+      },
+      {
+         "text":"Do disable the SA account if you intent to use this in production!",
+         "type":"warning"
+      }
+   ]
+}
--- a/misc/build.func
+++ b/misc/build.func
@ -382,74 +382,167 @@ exit_script() {
 # This function allows the user to configure advanced settings for the script.
 advanced_settings() {
  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Here is an instructional tip:" "To make a selection, use the Spacebar." 8 58
-  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
-  if [ "$var_os" != "alpine" ]; then
+  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "Default is: ${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
+    if [ "$var_os" != "alpine" ]; then
+    var_default_os="${var_os}"
    var_os=""
    while [ -z "$var_os" ]; do
-      if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution:" 10 58 2 \
-        "debian" "" OFF \
-        "ubuntu" "" OFF \
-        3>&1 1>&2 2>&3); then
-        if [ -n "$var_os" ]; then
-          echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+        if [ "$var_default_os" == "debian" ]; then
+          if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+            "debian" "" ON \
+            "ubuntu" "" OFF \
+            3>&1 1>&2 2>&3); then
+            if [ -n "$var_os" ]; then
+              echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            fi
+          else
+            exit_script
+          fi
+        fi
+        if [ "$var_default_os" == "ubuntu" ]; then
+          if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+            "debian" "" OFF \
+            "ubuntu" "" ON \
+            3>&1 1>&2 2>&3); then
+            if [ -n "$var_os" ]; then
+              echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            fi
+          else
+            exit_script
+          fi
        fi
-      else
-        exit_script
-      fi
    done
  fi

  if [ "$var_os" == "debian" ]; then
+    var_default_version="${var_version}"
    var_version=""
    while [ -z "$var_version" ]; do
-      if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
-        "11" "Bullseye" OFF \
-        "12" "Bookworm" OFF \
-        3>&1 1>&2 2>&3); then
-        if [ -n "$var_version" ]; then
-          echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+      if [ "$var_default_version" == "11" ]; then  
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+          "11" "Bullseye" ON \
+          "12" "Bookworm" OFF \
+          3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "12" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+          "11" "Bullseye" OFF \
+          "12" "Bookworm" ON \
+          3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
        fi
-      else
-        exit_script
      fi
    done
  fi

  if [ "$var_os" == "ubuntu" ]; then
+    var_default_version="${var_version}"
    var_version=""
    while [ -z "$var_version" ]; do
-      if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
-        "20.04" "Focal" OFF \
-        "22.04" "Jammy" OFF \
-        "24.04" "Noble" OFF \
-        "24.10" "Oracular" OFF \
-      3>&1 1>&2 2>&3); then
-        if [ -n "$var_version" ]; then
-          echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+      if [ "$var_default_version" == "20.04" ]; then  
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" ON \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "22.04" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" ON \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "24.04" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" ON \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "24.10" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" ON \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
        fi
-      else
-        exit_script
      fi
    done
  fi
  # Setting Default Tag for Advanced Settings
  TAGS="community-script;${var_tags:-}"
-
+  CT_DEFAULT_TYPE="${CT_TYPE}"
  CT_TYPE=""
  while [ -z "$CT_TYPE" ]; do
-    if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-      "1" "Unprivileged" OFF \
-      "0" "Privileged" OFF \
-      3>&1 1>&2 2>&3); then
-      if [ -n "$CT_TYPE" ]; then
-        CT_TYPE_DESC="Unprivileged"
-        if [ "$CT_TYPE" -eq 0 ]; then
-          CT_TYPE_DESC="Privileged"
+    if [ "$CT_DEFAULT_TYPE" == "1" ]; then 
+      if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+        "1" "Unprivileged" ON \
+        "0" "Privileged" OFF \
+        3>&1 1>&2 2>&3); then
+        if [ -n "$CT_TYPE" ]; then
+          CT_TYPE_DESC="Unprivileged"
+          if [ "$CT_TYPE" -eq 0 ]; then
+            CT_TYPE_DESC="Privileged"
+          fi
+          echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
        fi
-        echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+      else
+        exit_script
+      fi
+    fi
+    if [ "$CT_DEFAULT_TYPE" == "0" ]; then
+      if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+        "1" "Unprivileged" OFF \
+        "0" "Privileged" ON \
+        3>&1 1>&2 2>&3); then
+        if [ -n "$CT_TYPE" ]; then
+          CT_TYPE_DESC="Unprivileged"
+          if [ "$CT_TYPE" -eq 0 ]; then
+            CT_TYPE_DESC="Privileged"
+          fi
+          echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+        fi
+      else
+        exit_script
      fi
-    else
-      exit_script
    fi
  done

@ -597,7 +690,7 @@ advanced_settings() {
    APT_CACHER=""
    APT_CACHER_IP=""
  else
-    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for default)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
+    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for none)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
      APT_CACHER="${APT_CACHER_IP:+yes}"
      echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}${APT_CACHER_IP:-Default}${CL}"
    else
@ -612,7 +705,7 @@ advanced_settings() {
  fi
  echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"

-  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
+  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default [1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
    if [ -z $MTU1 ]; then
      MTU1="Default"
      MTU=""
@ -649,7 +742,7 @@ advanced_settings() {
    exit_script
  fi

-  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
+  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for generated MAC)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
    if [ -z $MAC1 ]; then
      MAC1="Default"
      MAC=""
@ -661,7 +754,7 @@ advanced_settings() {
    exit_script
  fi

-  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
+  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for no VLAN)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
    if [ -z $VLAN1 ]; then
      VLAN1="Default"
      VLAN=""
@ -675,14 +768,10 @@ advanced_settings() {

  if ADV_TAGS=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Custom Tags?[If you remove all, there will be no tags!]" 8 58 ${TAGS} --title "Advanced Tags" 3>&1 1>&2 2>&3); then
    if [ -n "${ADV_TAGS}" ]; then
-      ADV_TAGS=$(echo "$ADV_TAGS" | tr -d '[:space:]') # Remove whitespace from ADV_TAGS
-      if [[ "$ADV_TAGS" != *"community-script"* ]]; then
-        TAGS="community-script;${ADV_TAGS}"
-      else
-        TAGS="${ADV_TAGS}" # ADV_TAGS already contains "community-script"
-      fi
+      ADV_TAGS=$(echo "$ADV_TAGS" | tr -d '[:space:]') 
+        TAGS="${ADV_TAGS}"
    else
-      TAGS="community-script;"
+      TAGS=";"
    fi
      echo -e "${NETWORK}${BOLD}${DGN}Tags: ${BGN}$TAGS${CL}"
    else
Author	SHA1	Message	Date
Kristian Skov	6105ce023a	Merge `dcec2605a4` into `4dcf0dc0b8`	2025-01-20 19:00:24 +01:00
community-scripts-pr-app[bot]	4dcf0dc0b8	Update CHANGELOG.md (#1617 ) Some checks are pending Shellcheck / Shellcheck (push) Waiting to run Details Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run Details Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-01-20 18:04:18 +01:00
Michel Roegl-Brunner	81c327c317	[core] Update build.func: Add defaults to Advanced mode (#1548 ) * [core] Update build.func: Add defaults to Advanced mode * Change method * Fix copy mistake	2025-01-20 18:03:27 +01:00
community-scripts-pr-app[bot]	c9eb13a20c	Update CHANGELOG.md (#1615 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-01-20 17:25:02 +01:00
CanbiZ	c42438be11	add composer update https://github.com/community-scripts/ProxmoxVE/issues/1276	2025-01-20 16:51:05 +01:00
community-scripts-pr-app[bot]	dfc006271c	Update CHANGELOG.md (#1614 ) Some checks are pending Auto Update .app-headers / update-app-headers (push) Waiting to run Details Shellcheck / Shellcheck (push) Waiting to run Details Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run Details Frontend CI/CD / build (push) Waiting to run Details Frontend CI/CD / deploy (push) Blocked by required conditions Details Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-01-20 15:13:39 +01:00
Michel Roegl-Brunner	e64ecb9773	Testing (#1612 )	2025-01-20 15:11:42 +01:00
CanbiZ	85109ecf11	Feature: Add xCaddy for external Modules on Caddy-LXC (#1613 ) * add xcaddy to caddy for advanced modules * increase space of caddy * Update caddy.json * fix deps	2025-01-20 15:10:48 +01:00
CanbiZ	fb67025f3b	Update kimai-install.sh	2025-01-20 14:44:34 +01:00
Kristian Skov	dcec2605a4	Added script files	2025-01-14 16:33:33 +01:00