Merge branch 'main' into refactor/turnkey-modernize

Preserve telemetry type and report failures
Respect a pre-set TELEMETRY_TYPE in misc/api.func and use it in the API payload instead of the hardcoded "lxc". In turnkey/turnkey.sh, set TELEMETRY_TYPE="turnkey" for turnkey installs and enhance turnkey_cleanup() to report failed installs to telemetry (calls post_update_to_api "failed" with the exit code when POST_TO_API_DONE is true and POST_UPDATE_DONE is not), then destroy the failed container. These changes ensure correct telemetry type propagation and that failed turnkey deployments are reported.
2026-03-25 11:23:01 +01:00 · 2026-03-24 15:32:59 +01:00 · 2026-03-24 08:57:11 +01:00 · 2026-03-24 08:44:05 +01:00 · 2026-03-23 21:48:48 +01:00 · 2026-03-23 21:45:10 +01:00
4 changed files with 211 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -433,12 +433,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
  - Homebrew (Addon) ([#13249](https://github.com/community-scripts/ProxmoxVE/pull/13249))
 - NextExplorer ([#13252](https://github.com/community-scripts/ProxmoxVE/pull/13252))

-### 🚀 Updated Scripts
-
-  - #### ✨ New Features
-
-    - Turnkey: modernize turnkey.sh with shared libraries  [@MickLesk](https://github.com/MickLesk) ([#13242](https://github.com/community-scripts/ProxmoxVE/pull/13242))
-
 ## 2026-03-23

 ### 🚀 Updated Scripts
--- a/ct/booklore.sh
+++ b/ct/booklore.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/booklore-app/BookLore
+
+APP="BookLore"
+var_tags="${var_tags:-books;library}"
+var_cpu="${var_cpu:-3}"
+var_ram="${var_ram:-3072}"
+var_disk="${var_disk:-7}"
+var_os="${var_os:-debian}"
+var_version="${var_version:-13}"
+var_unprivileged="${var_unprivileged:-1}"
+
+header_info "$APP"
+variables
+color
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  if [[ ! -d /opt/booklore ]]; then
+    msg_error "No ${APP} Installation Found!"
+    exit
+  fi
+
+  if check_for_gh_release "booklore" "booklore-app/BookLore"; then
+    JAVA_VERSION="25" setup_java
+    NODE_VERSION="22" setup_nodejs
+    setup_mariadb
+    setup_yq
+    ensure_dependencies ffmpeg
+
+    msg_info "Stopping Service"
+    systemctl stop booklore
+    msg_ok "Stopped Service"
+
+    if grep -qE "^BOOKLORE_(DATA_PATH|BOOKDROP_PATH|BOOKS_PATH|PORT)=" /opt/booklore_storage/.env 2>/dev/null; then
+      msg_info "Migrating old environment variables"
+      sed -i 's/^BOOKLORE_DATA_PATH=/APP_PATH_CONFIG=/g' /opt/booklore_storage/.env
+      sed -i 's/^BOOKLORE_BOOKDROP_PATH=/APP_BOOKDROP_FOLDER=/g' /opt/booklore_storage/.env
+      sed -i '/^BOOKLORE_BOOKS_PATH=/d' /opt/booklore_storage/.env
+      sed -i '/^BOOKLORE_PORT=/d' /opt/booklore_storage/.env
+      msg_ok "Migrated old environment variables"
+    fi
+
+    msg_info "Backing up old installation"
+    mv /opt/booklore /opt/booklore_bak
+    msg_ok "Backed up old installation"
+
+    fetch_and_deploy_gh_release "booklore" "booklore-app/BookLore" "tarball"
+
+    msg_info "Building Frontend"
+    cd /opt/booklore/booklore-ui
+    $STD npm install --force
+    $STD npm run build --configuration=production
+    msg_ok "Built Frontend"
+
+    msg_info "Embedding Frontend into Backend"
+    mkdir -p /opt/booklore/booklore-api/src/main/resources/static
+    cp -r /opt/booklore/booklore-ui/dist/booklore/browser/* /opt/booklore/booklore-api/src/main/resources/static/
+    msg_ok "Embedded Frontend into Backend"
+
+    msg_info "Building Backend"
+    cd /opt/booklore/booklore-api
+    APP_VERSION=$(get_latest_github_release "booklore-app/BookLore")
+    yq eval ".app.version = \"${APP_VERSION}\"" -i src/main/resources/application.yaml
+    $STD ./gradlew clean build -x test --no-daemon
+    mkdir -p /opt/booklore/dist
+    JAR_PATH=$(find /opt/booklore/booklore-api/build/libs -maxdepth 1 -type f -name "booklore-api-*.jar" ! -name "*plain*" | head -n1)
+    if [[ -z "$JAR_PATH" ]]; then
+      msg_error "Backend JAR not found"
+      exit
+    fi
+    cp "$JAR_PATH" /opt/booklore/dist/app.jar
+    msg_ok "Built Backend"
+
+    if systemctl is-active --quiet nginx 2>/dev/null; then
+      msg_info "Removing Nginx (no longer needed)"
+      systemctl disable --now nginx
+      $STD apt-get purge -y nginx nginx-common
+      msg_ok "Removed Nginx"
+    fi
+
+    if ! grep -q "^SERVER_PORT=" /opt/booklore_storage/.env 2>/dev/null; then
+      echo "SERVER_PORT=6060" >>/opt/booklore_storage/.env
+    fi
+
+    sed -i 's|ExecStart=.*|ExecStart=/usr/bin/java -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompactObjectHeaders -XX:MaxRAMPercentage=75.0 -XX:+ExitOnOutOfMemoryError -jar /opt/booklore/dist/app.jar|' /etc/systemd/system/booklore.service
+    systemctl daemon-reload
+
+    msg_info "Starting Service"
+    systemctl start booklore
+    rm -rf /opt/booklore_bak
+    msg_ok "Started Service"
+    msg_ok "Updated successfully!"
+  fi
+  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 URL:${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:6060${CL}"
--- a/ct/headers/booklore
+++ b/ct/headers/booklore
@@ -0,0 +1,6 @@
+    ____              __   __                  
+   / __ )____  ____  / /__/ /   ____  ________ 
+  / __  / __ \/ __ \/ //_/ /   / __ \/ ___/ _ \
+ / /_/ / /_/ / /_/ / ,< / /___/ /_/ / /  /  __/
+/_____/\____/\____/_/|_/_____/\____/_/   \___/ 
+                                               
--- a/install/booklore-install.sh
+++ b/install/booklore-install.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/booklore-app/BookLore
+
+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 ffmpeg
+msg_ok "Installed Dependencies"
+
+JAVA_VERSION="25" setup_java
+NODE_VERSION="22" setup_nodejs
+setup_mariadb
+setup_yq
+MARIADB_DB_NAME="booklore_db" MARIADB_DB_USER="booklore_user" MARIADB_DB_EXTRA_GRANTS="GRANT SELECT ON \`mysql\`.\`time_zone_name\`" setup_mariadb_db
+fetch_and_deploy_gh_release "booklore" "booklore-app/BookLore" "tarball"
+
+msg_info "Building Frontend"
+cd /opt/booklore/booklore-ui
+$STD npm install --force
+$STD npm run build --configuration=production
+msg_ok "Built Frontend"
+
+msg_info "Embedding Frontend into Backend"
+mkdir -p /opt/booklore/booklore-api/src/main/resources/static
+cp -r /opt/booklore/booklore-ui/dist/booklore/browser/* /opt/booklore/booklore-api/src/main/resources/static/
+msg_ok "Embedded Frontend into Backend"
+
+msg_info "Creating Environment"
+mkdir -p /opt/booklore_storage/{data,books,bookdrop}
+cat <<EOF >/opt/booklore_storage/.env
+# Database Configuration
+DATABASE_URL=jdbc:mariadb://localhost:3306/${MARIADB_DB_NAME}
+DATABASE_USERNAME=${MARIADB_DB_USER}
+DATABASE_PASSWORD=${MARIADB_DB_PASS}
+
+# App Configuration (Spring Boot mapping from app.* properties)
+APP_PATH_CONFIG=/opt/booklore_storage/data
+APP_BOOKDROP_FOLDER=/opt/booklore_storage/bookdrop
+SERVER_PORT=6060
+EOF
+msg_ok "Created Environment"
+
+msg_info "Building Backend"
+cd /opt/booklore/booklore-api
+APP_VERSION=$(get_latest_github_release "booklore-app/BookLore")
+yq eval ".app.version = \"${APP_VERSION}\"" -i src/main/resources/application.yaml
+$STD ./gradlew clean build -x test --no-daemon
+mkdir -p /opt/booklore/dist
+JAR_PATH=$(find /opt/booklore/booklore-api/build/libs -maxdepth 1 -type f -name "booklore-api-*.jar" ! -name "*plain*" | head -n1)
+if [[ -z "$JAR_PATH" ]]; then
+  msg_error "Backend JAR not found"
+  exit 153
+fi
+cp "$JAR_PATH" /opt/booklore/dist/app.jar
+msg_ok "Built Backend"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/booklore.service
+[Unit]
+Description=BookLore Java Service
+After=network.target mariadb.service
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/booklore/dist
+ExecStart=/usr/bin/java -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompactObjectHeaders -XX:MaxRAMPercentage=75.0 -XX:+ExitOnOutOfMemoryError -jar /opt/booklore/dist/app.jar
+EnvironmentFile=/opt/booklore_storage/.env
+SuccessExitStatus=143
+TimeoutStopSec=10
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now booklore
+msg_ok "Created Service"
+
+motd_ssh
+customize
+cleanup_lxc
Author	SHA1	Message	Date
Slaviša Arežina	6002d029e8	Merge branch 'main' into refactor/turnkey-modernize	2026-03-24 15:32:59 +01:00
CanbiZ (MickLesk)	79aaf2a25e	Preserve telemetry type and report failures Respect a pre-set TELEMETRY_TYPE in misc/api.func and use it in the API payload instead of the hardcoded "lxc". In turnkey/turnkey.sh, set TELEMETRY_TYPE="turnkey" for turnkey installs and enhance turnkey_cleanup() to report failed installs to telemetry (calls post_update_to_api "failed" with the exit code when POST_TO_API_DONE is true and POST_UPDATE_DONE is not), then destroy the failed container. These changes ensure correct telemetry type propagation and that failed turnkey deployments are reported.	2026-03-24 08:57:11 +01:00
CanbiZ (MickLesk)	72ae89169c	bump hardcoded names to dynamic list	2026-03-24 08:44:05 +01:00
MickLesk	00d1966533	fix(turnkey): replace diagnostics_check with inline config read diagnostics_check() is defined in build.func which is not sourced. Read the diagnostics config file directly instead — respects existing user preference without prompting (turnkey has no settings menu).	2026-03-23 21:48:48 +01:00
MickLesk	1f60242308	refactor(turnkey): modernize turnkey.sh with shared libraries and telemetry - Source core.func, error_handler.func, api.func instead of custom error/msg functions - Replace custom error_exit/warn/info/msg with msg_info/msg_ok/msg_error/msg_warn - Upgrade validate_container_id to cluster-aware (pvesh + all-node config check) - Add diagnostics_check() and telemetry (post_to_api / post_update_to_api) - Add pve_check, shell_check, root_check for environment validation - Use proper EXIT trap for cleanup (destroy container on error, restart monitor) - Improve quoting throughout (PCT_OPTIONS as array, quoted variables) - Secure credentials file with chmod 600 - Use exit_script for user cancellations (consistent with other scripts)	2026-03-23 21:45:10 +01:00