mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-06-03 10:50:20 +00:00
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 <sunil@medhas.org>
This commit is contained in:
parent
4b24fda3f5
commit
72005d6205
@ -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()
|
||||
|
||||
|
||||
@ -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."""
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user