From efe303de310bb4814d8d60b30e58601d08908007 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 16 May 2023 13:46:43 -0700 Subject: [PATCH] ttrss: Use drop-in config component for /etc files Tests: - Config files are all symlinks in /etc/ - Web interface works Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/freedombox.maintscript | 1 + plinth/modules/ttrss/__init__.py | 8 +++++++- .../etc/apache2/conf-available/tt-rss-plinth.conf | 0 3 files changed, 8 insertions(+), 1 deletion(-) rename plinth/modules/ttrss/data/{ => usr/share/freedombox}/etc/apache2/conf-available/tt-rss-plinth.conf (100%) diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index fc9d746f3..3a4aaa393 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -138,3 +138,4 @@ rm_conffile /etc/avahi/services/ssh.service 23.10~ rm_conffile /etc/apache2/includes/freedombox-single-sign-on.conf 23.10~ rm_conffile /etc/apache2/conf-available/syncthing-plinth.conf 23.10~ rm_conffile /etc/apache2/conf-available/transmission-plinth.conf 23.10~ +rm_conffile /etc/apache2/conf-available/tt-rss-plinth.conf 23.10~ diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index 04f9bdb31..abc152eae 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -6,6 +6,7 @@ from django.utils.translation import gettext_lazy as _ from plinth import app as app_module from plinth import cfg, frontpage, menu +from plinth.config import DropinConfigs from plinth.daemon import Daemon from plinth.modules.apache.components import Webserver from plinth.modules.backups.components import BackupRestore @@ -37,7 +38,7 @@ class TTRSSApp(app_module.App): app_id = 'ttrss' - _version = 5 + _version = 6 def __init__(self): """Create components for the app.""" @@ -73,6 +74,11 @@ class TTRSSApp(app_module.App): ]) self.add(packages) + dropin_configs = DropinConfigs('dropin-configs-ttrss', [ + '/etc/apache2/conf-available/tt-rss-plinth.conf', + ]) + self.add(dropin_configs) + firewall = Firewall('firewall-ttrss', info.name, ports=['http', 'https'], is_external=True) self.add(firewall) diff --git a/plinth/modules/ttrss/data/etc/apache2/conf-available/tt-rss-plinth.conf b/plinth/modules/ttrss/data/usr/share/freedombox/etc/apache2/conf-available/tt-rss-plinth.conf similarity index 100% rename from plinth/modules/ttrss/data/etc/apache2/conf-available/tt-rss-plinth.conf rename to plinth/modules/ttrss/data/usr/share/freedombox/etc/apache2/conf-available/tt-rss-plinth.conf