Refactor: Threadfin (+ updateble)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -16,6 +16,12 @@ All LXC instances created using this repository come pre-installed with Midnight
 
 ## 2025-07-07
 
+### 🚀 Updated Scripts
+
+  - #### 🔧 Refactor
+
+    - Refactor: Changed the way we install BunkerWeb by leveraging the brand new install-bunkerweb.sh [@TheophileDiot](https://github.com/TheophileDiot) ([#5707](https://github.com/community-scripts/ProxmoxVE/pull/5707))
+
 ### 🌐 Website
 
   - #### 📝 Script Information

ct/bookstack.sh

@@ -39,7 +39,6 @@ function update_script() {
     msg_ok "Backup finished"
 
     fetch_and_deploy_gh_release "bookstack" "BookStackApp/BookStack"
-    PHP_MODULE="ldap,tidy,bz2,mysqli" PHP_FPM="YES" PHP_APACHE="YES" PHP_VERSION="8.3" setup_php
 
     msg_info "Restoring backup"
     cp /opt/bookstack-backup/.env /opt/bookstack/.env

ct/bunkerweb.sh

@@ -37,8 +37,8 @@ Pin: version ${RELEASE}
 Pin-Priority: 1001
 EOF
     apt-get update
-    apt-get install -y nginx=1.26.3*
+    apt-mark unhold bunkerweb nginx
-    apt-get install -y bunkerweb=${RELEASE}
+    apt-get install -y --allow-downgrades bunkerweb=${RELEASE}
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${RELEASE}"
 

ct/threadfin.sh

@@ -27,12 +27,24 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  msg_info "Updating $APP"
+
-  systemctl stop threadfin.service
+  RELEASE=$(curl -fsSL https://api.github.com/repos/threadfin/threadfin/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  curl -fsSL "https://github.com/Threadfin/Threadfin/releases/latest/download/Threadfin_linux_amd64" -o "/opt/threadfin/threadfin"
+  if [[ "${RELEASE}" != "$(cat ~/.threadfin 2>/dev/null)" ]] || [[ ! -f ~/.threadfin ]]; then
-  chmod +x /opt/threadfin/threadfin
+
-  systemctl start threadfin.service
+    msg_info "Stopping $APP"
-  msg_ok "Updated $APP"
+    systemctl stop threadfin
+    msg_ok "Stopped $APP"
+
+    fetch_and_deploy_gh_release "threadfin" "threadfin/threadfin" "singlefile" "latest" "/opt/threadfin" "Threadfin_linux_amd64"
+
+    msg_info "Starting $APP"
+    systemctl start threadfin
+    msg_ok "Started $APP"
+
+    msg_ok "Updated Successfully"
+  else
+    msg_ok "No update required. ${APP} is already at v${RELEASE}"
+  fi
   exit
 }
 

frontend/public/json/bunkerweb.json

@@ -31,5 +31,10 @@
     "username": null,
     "password": null
   },
-  "notes": []
+  "notes": [
+    {
+      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
+      "type": "warning"
+    }
+  ]
 }

frontend/public/json/threadfin.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-06-12",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 34400,
   "documentation": null,

install/bookstack-install.sh

@@ -19,8 +19,7 @@ $STD apt-get install -y \
   make
 msg_ok "Installed Dependencies"
 
-PHP_MODULE="ldap,tidy,bz2,mysqli" PHP_FPM="YES" PHP_APACHE="YES" PHP_VERSION="8.3" setup_php
+PHP_MODULE="fpm, ldap, tidy, bz2, mysql" PHP_FPM="YES" PHP_APACHE="YES" PHP_VERSION="8.2" setup_php
-
 setup_composer
 setup_mariadb
 

install/bunkerweb-install.sh

@@ -18,19 +18,12 @@ $STD apt-get install -y apt-transport-https
 $STD apt-get install -y lsb-release
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Nginx"
-curl -fsSL "https://nginx.org/keys/nginx_signing.key" | gpg --dearmor >/usr/share/keyrings/nginx-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/debian $(lsb_release -cs) nginx" >/etc/apt/sources.list.d/nginx.list
-$STD apt-get update
-$STD apt-get install -y nginx=1.26.3*
-msg_ok "Installed Nginx"
-
 RELEASE=$(curl -fsSL https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
 msg_info "Installing BunkerWeb v${RELEASE} (Patience)"
-curl -fsSL "https://repo.bunkerweb.io/bunkerity/bunkerweb/gpgkey" | gpg --dearmor >/etc/apt/keyrings/bunkerity_bunkerweb-archive-keyring.gpg
+curl -fsSL -o install-bunkerweb.sh https://github.com/bunkerity/bunkerweb/raw/v${RELEASE}/misc/install-bunkerweb.sh
-echo "deb [signed-by=/etc/apt/keyrings/bunkerity_bunkerweb-archive-keyring.gpg] https://repo.bunkerweb.io/bunkerity/bunkerweb/debian/ bookworm main" >/etc/apt/sources.list.d/bunkerity_bunkerweb.list
+chmod +x install-bunkerweb.sh
-$STD apt-get update
+$STD ./install-bunkerweb.sh --yes
-$STD apt-get install -y bunkerweb=${RELEASE}
+$STD apt-mark unhold bunkerweb nginx
 cat <<EOF >/etc/apt/preferences.d/bunkerweb
 Package: bunkerweb
 Pin: version ${RELEASE}

install/threadfin-install.sh

@@ -14,16 +14,12 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y ffmpeg
+$STD apt-get install -y \
-$STD apt-get install -y vlc
+  ffmpeg \
+  vlc
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Threadfin"
+fetch_and_deploy_gh_release "threadfin" "threadfin/threadfin" "singlefile" "latest" "/opt/threadfin" "Threadfin_linux_amd64"
-mkdir -p /opt/threadfin
-curl -fsSL "https://github.com/Threadfin/Threadfin/releases/latest/download/Threadfin_linux_amd64" -o "/opt/threadfin/threadfin"
-chmod +x /opt/threadfin/threadfin
-
-msg_ok "Installed Threadfin"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/threadfin.service

misc/tools.func

@@ -434,13 +434,6 @@ function setup_php() {
     $STD apt-get update
   fi
 
-  for pkg in $MODULE_LIST; do
-    if ! apt-cache show "$pkg" >/dev/null 2>&1; then
-      msg_error "Package not found: $pkg"
-      exit 1
-    fi
-  done
-
   local MODULE_LIST="php${PHP_VERSION}"
   IFS=',' read -ra MODULES <<<"$COMBINED_MODULES"
   for mod in "${MODULES[@]}"; do
@@ -450,10 +443,6 @@ function setup_php() {
   if [[ "$PHP_FPM" == "YES" ]]; then
     MODULE_LIST+=" php${PHP_VERSION}-fpm"
   fi
-  if [[ "$PHP_APACHE" == "YES" ]]; then
-    $STD apt-get install -y apache2
-    $STD systemctl restart apache2 || true
-  fi
 
   if [[ "$PHP_APACHE" == "YES" ]] && [[ -n "$CURRENT_PHP" ]]; then
     if [[ -f /etc/apache2/mods-enabled/php${CURRENT_PHP}.load ]]; then
@@ -469,6 +458,10 @@ function setup_php() {
   $STD apt-get install -y $MODULE_LIST
   msg_ok "Setup PHP $PHP_VERSION"
 
+  if [[ "$PHP_APACHE" == "YES" ]]; then
+    $STD systemctl restart apache2 || true
+  fi
+
   if [[ "$PHP_FPM" == "YES" ]]; then
     $STD systemctl enable php${PHP_VERSION}-fpm
     $STD systemctl restart php${PHP_VERSION}-fpm