From 0bddd4bb544af93dd8d28468a41ceeb52f86b7d4 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 16 May 2023 11:46:52 -0700 Subject: [PATCH] janus: Use drop-in config component for /etc files Tests: - Config files are all symlinks in /etc/ - Web interface is accessible Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/freedombox.maintscript | 1 + plinth/modules/janus/__init__.py | 8 +++++++- .../etc/apache2/conf-available/janus-freedombox.conf | 0 3 files changed, 8 insertions(+), 1 deletion(-) rename plinth/modules/janus/data/{ => usr/share/freedombox}/etc/apache2/conf-available/janus-freedombox.conf (100%) diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index 1b18b42ca..0342fe9a3 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -112,3 +112,4 @@ rm_conffile /etc/apache2/conf-available/i2p-freedombox.conf 23.10~ rm_conffile /etc/ikiwiki/plinth-blog.setup 23.10~ rm_conffile /etc/ikiwiki/plinth-wiki.setup 23.10~ rm_conffile /etc/apache2/conf-available/ikiwiki-plinth.conf 23.10~ +rm_conffile /etc/apache2/conf-available/janus-freedombox.conf 23.10~ diff --git a/plinth/modules/janus/__init__.py b/plinth/modules/janus/__init__.py index eb18c2a42..8d26e3d25 100644 --- a/plinth/modules/janus/__init__.py +++ b/plinth/modules/janus/__init__.py @@ -8,6 +8,7 @@ from django.utils.translation import gettext_lazy as _ from plinth import app as app_module from plinth import 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 @@ -32,7 +33,7 @@ class JanusApp(app_module.App): app_id = 'janus' - _version = 1 + _version = 2 def __init__(self): """Create components for the app.""" @@ -64,6 +65,11 @@ class JanusApp(app_module.App): ]) self.add(packages) + dropin_configs = DropinConfigs('dropin-configs-janus', [ + '/etc/apache2/conf-available/janus-freedombox.conf', + ]) + self.add(dropin_configs) + firewall = Firewall('firewall-janus', info.name, ports=['http', 'https', 'janus-freedombox'], is_external=True) diff --git a/plinth/modules/janus/data/etc/apache2/conf-available/janus-freedombox.conf b/plinth/modules/janus/data/usr/share/freedombox/etc/apache2/conf-available/janus-freedombox.conf similarity index 100% rename from plinth/modules/janus/data/etc/apache2/conf-available/janus-freedombox.conf rename to plinth/modules/janus/data/usr/share/freedombox/etc/apache2/conf-available/janus-freedombox.conf