From df7e2e313f322bc240b82b7261a051e17a5996f4 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 16 May 2023 11:56:40 -0700 Subject: [PATCH] minidlna: Use drop-in config component for /etc files Tests: - Config files are all symlinks in /etc/ - /_minidlna/ works and shows a 404 generated by miniDLNA Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/freedombox.maintscript | 1 + plinth/modules/mediawiki/__init__.py | 1 - plinth/modules/minidlna/__init__.py | 8 +++++++- .../etc/apache2/conf-available/minidlna-freedombox.conf | 0 4 files changed, 8 insertions(+), 2 deletions(-) rename plinth/modules/minidlna/data/{ => usr/share/freedombox}/etc/apache2/conf-available/minidlna-freedombox.conf (100%) diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index 60e359d2b..39934f6f7 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -119,3 +119,4 @@ rm_conffile /etc/fail2ban/jail.d/matrix-auth-freedombox.conf 23.10~ rm_conffile /etc/fail2ban/filter.d/matrix-auth-freedombox.conf 23.10~ rm_conffile /etc/apache2/conf-available/mediawiki-freedombox.conf 23.10~ rm_conffile /etc/mediawiki/FreedomBoxStaticSettings.php 23.10~ +rm_conffile /etc/apache2/conf-available/minidlna-freedombox.conf 23.10~ diff --git a/plinth/modules/mediawiki/__init__.py b/plinth/modules/mediawiki/__init__.py index 897b7bc7d..c9f86d7ab 100644 --- a/plinth/modules/mediawiki/__init__.py +++ b/plinth/modules/mediawiki/__init__.py @@ -154,7 +154,6 @@ def get_config(): create_permission = _get_config_value( "$wgGroupPermissions['*']['createaccount']") read_permission = _get_config_value("$wgGroupPermissions['*']['read']") - print('=====', create_permission, read_permission) return { 'default_skin': _get_config_value('$wgDefaultSkin'), 'domain': urlparse(server_url).netloc, diff --git a/plinth/modules/minidlna/__init__.py b/plinth/modules/minidlna/__init__.py index dbb1b9e8f..6cc2c6a1b 100644 --- a/plinth/modules/minidlna/__init__.py +++ b/plinth/modules/minidlna/__init__.py @@ -6,6 +6,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 import firewall from plinth.modules.apache.components import Webserver @@ -34,7 +35,7 @@ class MiniDLNAApp(app_module.App): app_id = 'minidlna' - _version = 4 + _version = 5 def __init__(self): """Initialize the app components.""" @@ -71,6 +72,11 @@ class MiniDLNAApp(app_module.App): packages = Packages('packages-minidlna', ['minidlna']) self.add(packages) + dropin_configs = DropinConfigs( + 'dropin-configs-minidlna', + ['/etc/apache2/conf-available/minidlna-freedombox.conf']) + self.add(dropin_configs) + firewall = Firewall('firewall-minidlna', info.name, ports=['minidlna'], is_external=False) self.add(firewall) diff --git a/plinth/modules/minidlna/data/etc/apache2/conf-available/minidlna-freedombox.conf b/plinth/modules/minidlna/data/usr/share/freedombox/etc/apache2/conf-available/minidlna-freedombox.conf similarity index 100% rename from plinth/modules/minidlna/data/etc/apache2/conf-available/minidlna-freedombox.conf rename to plinth/modules/minidlna/data/usr/share/freedombox/etc/apache2/conf-available/minidlna-freedombox.conf