Update omada-install.sh

* fix path for omada update

* fix omada install

CHANGELOG.md

@@ -16,6 +16,21 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
+## 2024-12-31
+
+### Changed
+
+### 💥 Breaking Changes
+
+- Add ExecReload to prometheus.service [@BasixKOR](https://github.com/BasixKOR) ([#1131](https://github.com/community-scripts/ProxmoxVE/pull/1131))
+- Fix: Figlet Version & Font Check [@MickLesk](https://github.com/MickLesk) ([#1133](https://github.com/community-scripts/ProxmoxVE/pull/1133))
+
+### 🚀 Updated Scripts
+
+- fix: guacd service not start during Apache-Guacamole script installation process [@PhoenixEmik](https://github.com/PhoenixEmik) ([#1122](https://github.com/community-scripts/ProxmoxVE/pull/1122))
+- Fix Homepage-Script: Installation/Update [@MickLesk](https://github.com/MickLesk) ([#1129](https://github.com/community-scripts/ProxmoxVE/pull/1129))
+- Netbox: Updating URL to https [@surajsbmn](https://github.com/surajsbmn) ([#1124](https://github.com/community-scripts/ProxmoxVE/pull/1124))
+
 ## 2024-12-30
 
 ### Changed

ct/homepage.sh

@@ -50,16 +50,14 @@ function update_script() {
     cp -r homepage-${RELEASE}/* /opt/homepage/
     rm -rf homepage-${RELEASE}
     cd /opt/homepage
-    npx update-browserslist-db@latest
+    npx update-browserslist-db@latest >/dev/null 2>&1
-    pnpm install
+    pnpm install >/dev/null 2>&1
-    export NEXT_PUBLIC_VERSION=v$RELEASE
+    pnpm build >/dev/null 2>&1
-    export NEXT_PUBLIC_REVISION='source' 
-    pnpm build
     systemctl start homepage
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated Homepage to v${RELEASE}"
   else
-    msg_ok "No update required. ${APP} is already at ${RELEASE}"
+    msg_ok "No update required. ${APP} is already at v${RELEASE}"
   fi
   exit
 }

ct/netbox.sh

@@ -87,4 +87,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}${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}https://${IP}${CL}"

ct/omada.sh

@@ -32,9 +32,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  latest_url=$(curl -s "https://support.omadanetworks.com/en/product/omada-software-controller/?resourceType=download" | \
+  latest_url=$(curl -s "https://support.omadanetworks.com/en/product/omada-software-controller/?resourceType=download" | grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | head -n 1)
-  grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | \
-  head -n 1)
   latest_version=$(basename "$latest_url")
   if [ -z "${latest_version}" ]; then
     msg_error "It seems that the server (tp-link.com) might be down. Please try again at a later time."

install/apache-guacamole-install.sh

@@ -126,7 +126,21 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl -q enable --now tomcat guacd mysql
+cat <<EOF >/etc/systemd/system/guacd.service
+[Unit]
+Description=Guacamole Proxy Daemon (guacd)
+After=mysql.service tomcat.service
+Requires=mysql.service tomcat.service
+[Service]
+Type=forking
+ExecStart=/etc/init.d/guacd start
+ExecStop=/etc/init.d/guacd stop
+ExecReload=/etc/init.d/guacd restart
+PIDFile=/var/run/guacd.pid
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl -q enable --now mysql tomcat guacd
 msg_ok "Setup Service"
 
 motd_ssh

install/homepage-install.sh

@@ -43,8 +43,7 @@ rm -rf homepage-${RELEASE}
 cd /opt/homepage
 cp /opt/homepage/src/skeleton/* /opt/homepage/config
 $STD pnpm install
-$STD export NEXT_PUBLIC_VERSION=v$RELEASE 
+$STD pnpm build
-$STD export NEXT_PUBLIC_REVISION='source' $STD pnpm build
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed Homepage v${RELEASE}"
 

install/omada-install.sh

@@ -38,9 +38,7 @@ wget -qL https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/3.6/multiv
 $STD dpkg -i mongodb-org-server_3.6.23_amd64.deb
 msg_ok "Installed MongoDB"
 
-latest_url=$(curl -s "https://support.omadanetworks.com/en/product/omada-software-controller/?resourceType=download" | \
+latest_url=$(curl -s "https://support.omadanetworks.com/en/product/omada-software-controller/?resourceType=download" | grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | head -n 1)
-grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | \
-head -n 1)
 latest_version=$(basename "$latest_url")
 
 msg_info "Installing Omada Controller"

install/prometheus-install.sh

@@ -46,6 +46,7 @@ ExecStart=/usr/local/bin/prometheus \
     --config.file=/etc/prometheus/prometheus.yml \
     --storage.tsdb.path=/var/lib/prometheus/ \
     --web.listen-address=0.0.0.0:9090
+ExecReload=/bin/kill -HUP \$MAINPID
 
 [Install]
 WantedBy=multi-user.target" >$service_path

misc/build.func

@@ -189,40 +189,59 @@ update_motd_ip() {
 
 # This function sets the APP-Name into an ASCII Header in Slant, figlet needed on proxmox main node.
 header_info() {
-  # Check if figlet is installed
+  # Helper function: Install FIGlet and download fonts
-  if ! command -v figlet &> /dev/null; then
+  install_figlet() {
-    echo -e "${INFO}${BOLD}${DGN}Figlet for ASCII-Header not found. Installing... ${CL}"
+    echo -e "${INFO}${BOLD}${DGN}Installing FIGlet...${CL}"
 
-    # Install necessary dependencies and figlet
-    if [ -f /etc/debian_version ] || [ -f /etc/lsb-release ]; then
-      apt-get update -y &> /dev/null
-      apt-get install -y tar build-essential &> /dev/null
-    elif [ -f /etc/alpine-release ]; then
-      apk add --no-cache tar build-base &> /dev/null
-      export TERM=xterm
-    else
-      return 1
-    fi
     temp_dir=$(mktemp -d)
     curl -sL https://github.com/community-scripts/ProxmoxVE/raw/refs/heads/main/misc/figlet.tar.xz -o "$temp_dir/figlet.tar.xz"
     mkdir -p /tmp/figlet
     tar -xf "$temp_dir/figlet.tar.xz" -C /tmp/figlet --strip-components=1
     cd /tmp/figlet
-    # Run make to compile the figlet binary
     make >/dev/null
-    # Check if the figlet binary exists
+
     if [ -f "figlet" ]; then
       chmod +x figlet
-      # Move figlet to /usr/local/bin if not already there
+      mv figlet /usr/local/bin/
-      if [ ! -e /usr/local/bin/figlet ]; then
+      mkdir -p /usr/local/share/figlet
-        mv figlet /usr/local/bin/
+      cp -r /tmp/figlet/fonts/*.flf /usr/local/share/figlet/
-        mkdir -p /usr/local/share/figlet
+      echo -e "${CM}${BOLD}${DGN}FIGlet successfully installed.${CL}"
-        cp -r /tmp/figlet/fonts/*.flf /usr/local/share/figlet/
+    else
-      fi
+      echo -e "${ERR}${BOLD}${RED}Failed to install FIGlet.${CL}"
-      echo -e "${CM}${BOLD}${DGN}Figlet successfully installed. ${CL}"
+      return 1
     fi
     rm -rf "$temp_dir"
+  }
+
+  # Check if figlet and the slant font are available
+  if ! figlet -f slant "Test" &>/dev/null; then
+    echo -e "${INFO}${BOLD}${DGN}FIGlet or the slant font is missing. Installing...${CL}"
+
+    if [ -f /etc/debian_version ] || [ -f /etc/lsb-release ]; then
+      # Debian/Ubuntu-based systems
+      apt-get update -y &>/dev/null
+      apt-get install -y wget build-essential &>/dev/null
+      install_figlet
+
+    elif [ -f /etc/alpine-release ]; then
+      # Alpine-based systems
+      apk add --no-cache tar xz build-base wget &>/dev/null
+      export TERM=xterm
+      install_figlet
+
+    else
+      echo -e "${ERR}${BOLD}${RED}Unsupported operating system.${CL}"
+      return 1
+    fi
+
+    # Ensure the slant font is available
+    if [ ! -f "/usr/share/figlet/slant.flf" ]; then
+      echo -e "${INFO}${BOLD}${DGN}Downloading slant font...${CL}"
+      wget -qO /usr/share/figlet/slant.flf "http://www.figlet.org/fonts/slant.flf"
+    fi
   fi
+
+  # Display ASCII header
   term_width=$(tput cols 2>/dev/null || echo 120)
   ascii_art=$(figlet -f slant -w "$term_width" "$APP")
   clear