From 72005d62051c79c4d34981f0570b05890a06ab3b Mon Sep 17 00:00:00 2001 From: Frederico Gomes Date: Thu, 26 Feb 2026 10:51:11 +0000 Subject: [PATCH] miniflux: Revert workaround for a packaging bug with DB connection This reverts commit 9af9a504e09b8021041a7d8fe4540574f42edc1c. This workaround is no longer needed as the file is no longer used. Reverted as per: https://salsa.debian.org/freedombox-team/freedombox/-/merge_requests/2752#note_728315 **plinth/modules/miniflux/__init__.py** - Keep version bump **plinth/modules/miniflux/privileged.py** - Keep docstring fix Reviewed-by: Sunil Mohan Adapa --- plinth/modules/miniflux/__init__.py | 1 - plinth/modules/miniflux/privileged.py | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/plinth/modules/miniflux/__init__.py b/plinth/modules/miniflux/__init__.py index 1a4083379..509d8a48d 100644 --- a/plinth/modules/miniflux/__init__.py +++ b/plinth/modules/miniflux/__init__.py @@ -105,7 +105,6 @@ class MinifluxApp(app_module.App): 'shared-daemon-miniflux-postgresql').ensure_running(): super().setup(old_version) - privileged.setup(old_version) if not old_version: self.enable() diff --git a/plinth/modules/miniflux/privileged.py b/plinth/modules/miniflux/privileged.py index e30b09170..4490a5946 100644 --- a/plinth/modules/miniflux/privileged.py +++ b/plinth/modules/miniflux/privileged.py @@ -4,7 +4,6 @@ import json import os import pathlib -import shutil from typing import Tuple from urllib.parse import urlparse @@ -55,20 +54,6 @@ def pre_setup(): vars_file.write_text(_dict_to_env_file(new_settings)) -@privileged -def setup(old_version: int): - """Perform post-install actions for Miniflux.""" - # Fix incorrect permissions on database file in version 2.2.0-2. See - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081562 . Can be - # removed after the fix for the bug reaches Trixie/testing. - shutil.chown(DATABASE_FILE, user='miniflux', group='root') - if not old_version or action_utils.service_is_enabled('miniflux'): - # If the service was tried too many times already, it won't - # successfully restart. - action_utils.service_reset_failed('miniflux') - action_utils.service_restart('miniflux') - - def _run_miniflux_interactively(command: str, username: str, password: str) -> Tuple[str, dict]: """Fill interactive terminal prompt for username and password."""