Compare commits

..

1 Commits

Author SHA1 Message Date
CanbiZ
977377db2f paperless: refactor - remove backup after update and enable clean install
Removes backup directory post-update to prevent orphans. Enables CLEAN_INSTALL for proper cleanup. Adds Debian version-specific Ghostscript installation.
2025-11-08 19:59:08 +01:00
3 changed files with 65 additions and 29 deletions

View File

@@ -22,10 +22,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
- MongoDB: Remove unused message [@tremor021](https://github.com/tremor021) ([#8969](https://github.com/community-scripts/ProxmoxVE/pull/8969)) - MongoDB: Remove unused message [@tremor021](https://github.com/tremor021) ([#8969](https://github.com/community-scripts/ProxmoxVE/pull/8969))
- Set TZ=Etc/UTC in Ghostfolio installation script [@LuloDev](https://github.com/LuloDev) ([#8961](https://github.com/community-scripts/ProxmoxVE/pull/8961)) - Set TZ=Etc/UTC in Ghostfolio installation script [@LuloDev](https://github.com/LuloDev) ([#8961](https://github.com/community-scripts/ProxmoxVE/pull/8961))
- #### 🔧 Refactor
- Refactor setup_deb822_repo for optional architectures [@MickLesk](https://github.com/MickLesk) ([#8983](https://github.com/community-scripts/ProxmoxVE/pull/8983))
## 2025-11-07 ## 2025-11-07
### 🆕 New Scripts ### 🆕 New Scripts

View File

@@ -42,9 +42,15 @@ function update_script() {
msg_ok "Backup completed" msg_ok "Backup completed"
PYTHON_VERSION="3.13" setup_uv PYTHON_VERSION="3.13" setup_uv
fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc"
setup_gs
. /etc/os-release
if [ "$VERSION_CODENAME" = "bookworm" ]; then
setup_gs
else
$STD apt install -y ghostscript
fi
msg_info "Updating Paperless-ngx" msg_info "Updating Paperless-ngx"
cp -r /opt/paperless/backup/* /opt/paperless/ cp -r /opt/paperless/backup/* /opt/paperless/
@@ -53,6 +59,11 @@ function update_script() {
cd /opt/paperless/src cd /opt/paperless/src
$STD uv run -- python manage.py migrate $STD uv run -- python manage.py migrate
msg_ok "Updated Paperless-ngx" msg_ok "Updated Paperless-ngx"
if [[ -d /opt/paperless/backup ]]; then
rm -rf /opt/paperless/backup || msg_warn "Failed to remove /opt/paperless/backup"
msg_ok "Removed backup directory"
fi
else else
msg_warn "You are about to migrate your Paperless-ngx installation to uv!" msg_warn "You are about to migrate your Paperless-ngx installation to uv!"
msg_custom "🔒" "It is strongly recommended to take a Proxmox snapshot first:" msg_custom "🔒" "It is strongly recommended to take a Proxmox snapshot first:"
@@ -103,9 +114,17 @@ function update_script() {
msg_ok "Backup completed" msg_ok "Backup completed"
PYTHON_VERSION="3.13" setup_uv PYTHON_VERSION="3.13" setup_uv
fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc"
setup_gs
. /etc/os-release
if [ "$VERSION_CODENAME" = "bookworm" ]; then
setup_gs
else
msg_info "Installing Ghostscript"
$STD apt install -y ghostscript
msg_ok "Installed Ghostscript"
fi
msg_info "Updating Paperless-ngx" msg_info "Updating Paperless-ngx"
cp -r /opt/paperless/backup/* /opt/paperless/ cp -r /opt/paperless/backup/* /opt/paperless/
@@ -114,6 +133,11 @@ function update_script() {
cd /opt/paperless/src cd /opt/paperless/src
$STD uv run -- python manage.py migrate $STD uv run -- python manage.py migrate
msg_ok "Paperless-ngx migration and update completed" msg_ok "Paperless-ngx migration and update completed"
if [[ -d /opt/paperless/backup ]]; then
rm -rf /opt/paperless/backup || msg_warn "Failed to remove /opt/paperless/backup"
msg_ok "Removed backup directory"
fi
fi fi
msg_info "Starting all Paperless-ngx Services" msg_info "Starting all Paperless-ngx Services"

View File

@@ -1198,8 +1198,8 @@ ensure_apt_working() {
} }
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Standardized deb822 repository setup (with optional Architectures) # Standardized deb822 repository setup
# Always runs apt update after repo creation to ensure package availability # Validates all parameters and fails safely if any are empty
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
setup_deb822_repo() { setup_deb822_repo() {
local name="$1" local name="$1"
@@ -1207,40 +1207,56 @@ setup_deb822_repo() {
local repo_url="$3" local repo_url="$3"
local suite="$4" local suite="$4"
local component="${5:-main}" local component="${5:-main}"
local architectures="$6" # optional local architectures="${6:-$(dpkg --print-architecture)}"
# Validate required parameters # Validate required parameters
if [[ -z "$name" || -z "$gpg_url" || -z "$repo_url" || -z "$suite" ]]; then if [[ -z "$name" || -z "$gpg_url" || -z "$repo_url" || -z "$suite" ]]; then
msg_error "setup_deb822_repo: missing required parameters (name=$name repo=$repo_url suite=$suite)" msg_error "setup_deb822_repo: missing required parameters (name=$name, gpg=$gpg_url, repo=$repo_url, suite=$suite)"
return 1 return 1
fi fi
# Cleanup # Cleanup old configs for this app
cleanup_old_repo_files "$name" cleanup_old_repo_files "$name"
# Cleanup any orphaned .sources files from other apps
cleanup_orphaned_sources cleanup_orphaned_sources
# Ensure keyring directory exists
mkdir -p /etc/apt/keyrings || { mkdir -p /etc/apt/keyrings || {
msg_error "Failed to create /etc/apt/keyrings" msg_error "Failed to create /etc/apt/keyrings directory"
return 1 return 1
} }
# Import GPG # Download GPG key (with --yes to avoid interactive prompts)
curl -fsSL "$gpg_url" | gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" || { curl -fsSL "$gpg_url" | gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" 2>/dev/null || {
msg_error "Failed to import GPG key for ${name}" msg_error "Failed to download or import GPG key for ${name} from $gpg_url"
return 1 return 1
} }
# Write deb822 # Create deb822 sources file
{ cat <<EOF >/etc/apt/sources.list.d/${name}.sources
echo "Types: deb" Types: deb
echo "URIs: $repo_url" URIs: $repo_url
echo "Suites: $suite" Suites: $suite
echo "Components: $component" Components: $component
[[ -n "$architectures" ]] && echo "Architectures: $architectures" Architectures: $architectures
echo "Signed-By: /etc/apt/keyrings/${name}.gpg" Signed-By: /etc/apt/keyrings/${name}.gpg
} >/etc/apt/sources.list.d/${name}.sources EOF
$STD apt update # Use cached apt update
local apt_cache_file="/var/cache/apt-update-timestamp"
local current_time=$(date +%s)
local last_update=0
if [[ -f "$apt_cache_file" ]]; then
last_update=$(cat "$apt_cache_file" 2>/dev/null || echo 0)
fi
# For repo changes, always update but respect short-term cache (30s)
if ((current_time - last_update > 30)); then
$STD apt update
echo "$current_time" >"$apt_cache_file"
fi
} }
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------