From 8540bc36273e768e17d40e1cd4d0d7e2af6fc205 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Wed, 14 Jan 2026 15:49:44 +0100 Subject: [PATCH] fixes --- ct/databasus.sh | 21 +++++++++++++-------- install/databasus-install.sh | 2 +- install/piler-install.sh | 16 ++++++++-------- misc/tools.func | 17 +++++++++++++---- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ct/databasus.sh b/ct/databasus.sh index d7c2dd0a8..c0eab526b 100644 --- a/ct/databasus.sh +++ b/ct/databasus.sh @@ -3,7 +3,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV # Copyright (c) 2021-2026 community-scripts ORG # Author: MickLesk (CanbiZ) # License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE -# Source: https://github.com/RostislavDugin/postgresus +# Source: https://github.com/databasus/databasus APP="Databasus" var_tags="${var_tags:-backup;postgresql;database}" @@ -24,12 +24,12 @@ function update_script() { check_container_storage check_container_resources - if [[ ! -f /opt/postgresus/postgresus ]]; then + if [[ ! -f /opt/databasus/databasus ]]; then msg_error "No ${APP} Installation Found!" exit fi - if check_for_gh_release "Databasus" "Databasus"; then + if check_for_gh_release "databasus" "databasus/databasus"; then msg_info "Stopping Databasus" $STD systemctl stop databasus msg_ok "Stopped Databasus" @@ -38,23 +38,28 @@ function update_script() { cp /opt/databasus/.env /tmp/databasus.env.bak msg_ok "Backed up Configuration" + msg_info "Updating Databasus" fetch_and_deploy_gh_release "databasus" "databasus/databasus" "tarball" "latest" "/opt/databasus" - msg_info "Updating Databasus" cd /opt/databasus/frontend $STD npm ci $STD npm run build + cd /opt/databasus/backend $STD go mod download - $STD go build -o ../databasus ./cmd/main.go - cd /opt/databasus/ - cp -r frontend/dist ui - cp -r backend/migrations . + $STD /root/go/bin/swag init -g cmd/main.go -o swagger + $STD env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o databasus ./cmd/main.go + mv /opt/databasus/backend/databasus /opt/databasus/databasus + + cp -r /opt/databasus/frontend/dist/* /opt/databasus/ui/build/ + cp -r /opt/databasus/backend/migrations /opt/databasus/ + chown -R postgres:postgres /opt/databasus msg_ok "Updated Databasus" msg_info "Restoring Configuration" cp /tmp/databasus.env.bak /opt/databasus/.env rm -f /tmp/databasus.env.bak + chown postgres:postgres /opt/databasus/.env msg_ok "Restored Configuration" msg_info "Starting Databasus" diff --git a/install/databasus-install.sh b/install/databasus-install.sh index 65768c03d..fbac56054 100644 --- a/install/databasus-install.sh +++ b/install/databasus-install.sh @@ -147,7 +147,7 @@ server { } } EOF -ln -sf /etc/nginx/sites-available/postgresus /etc/nginx/sites-enabled/postgresus +ln -sf /etc/nginx/sites-available/databasus /etc/nginx/sites-enabled/databasus rm -f /etc/nginx/sites-enabled/default $STD nginx -t $STD systemctl enable -q --now nginx diff --git a/install/piler-install.sh b/install/piler-install.sh index 6eb3e327f..e775b16bf 100644 --- a/install/piler-install.sh +++ b/install/piler-install.sh @@ -33,7 +33,7 @@ msg_ok "Installed Dependencies" import_local_ip setup_mariadb MARIADB_DB_NAME="piler" MARIADB_DB_USER="piler" setup_mariadb_db -PHP_VERSION="8.4" PHP_FPM="YES" PHP_MODULE="ldap,gd,memcached,pdo,mysql,curl,zip" setup_php +PHP_VERSION="8.3" PHP_FPM="YES" PHP_MODULE="ldap,gd,memcached,pdo,mysql,curl,zip" setup_php msg_info "Installing Manticore Search" cd /tmp @@ -171,12 +171,12 @@ $STD systemctl enable --now piler msg_ok "Created Piler Service" msg_info "Configuring PHP-FPM Pool" -cp /etc/php/8.4/fpm/pool.d/www.conf /etc/php/8.4/fpm/pool.d/piler.conf -sed -i 's/\[www\]/[piler]/' /etc/php/8.4/fpm/pool.d/piler.conf -sed -i 's/^user = www-data/user = piler/' /etc/php/8.4/fpm/pool.d/piler.conf -sed -i 's/^group = www-data/group = piler/' /etc/php/8.4/fpm/pool.d/piler.conf -sed -i 's|^listen = .*|listen = /run/php/php8.4-fpm-piler.sock|' /etc/php/8.4/fpm/pool.d/piler.conf -$STD systemctl restart php8.4-fpm +cp /etc/php/8.3/fpm/pool.d/www.conf /etc/php/8.3/fpm/pool.d/piler.conf +sed -i 's/\[www\]/[piler]/' /etc/php/8.3/fpm/pool.d/piler.conf +sed -i 's/^user = www-data/user = piler/' /etc/php/8.3/fpm/pool.d/piler.conf +sed -i 's/^group = www-data/group = piler/' /etc/php/8.3/fpm/pool.d/piler.conf +sed -i 's|^listen = .*|listen = /run/php/php8.3-fpm-piler.sock|' /etc/php/8.3/fpm/pool.d/piler.conf +$STD systemctl restart php8.3-fpm msg_ok "Configured PHP-FPM Pool" msg_info "Configuring Piler Web GUI" @@ -250,7 +250,7 @@ server { } location ~ \.php$ { - fastcgi_pass unix:/run/php/php8.4-fpm-piler.sock; + fastcgi_pass unix:/run/php/php8.3-fpm-piler.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; include fastcgi_params; diff --git a/misc/tools.func b/misc/tools.func index f3c288764..7e18d475d 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -4488,10 +4488,19 @@ EOF return 1 } - manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || { - msg_error "Failed to setup PHP repository" - return 1 - } + # Use different repository based on OS + if [[ "$DISTRO_ID" == "ubuntu" ]]; then + # Ubuntu: Use ondrej/php PPA + msg_info "Adding ondrej/php PPA for Ubuntu" + $STD apt install -y software-properties-common + $STD add-apt-repository -y ppa:ondrej/php + else + # Debian: Use Sury repository + manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || { + msg_error "Failed to setup PHP repository" + return 1 + } + fi ensure_apt_working || return 1 $STD apt update