nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

minidlna: Use drop-in config component for /etc files

Browse Source 
Tests:

- Config files are all symlinks in /etc/
- /_minidlna/ works and shows a 404 generated by miniDLNA

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2023-05-16 11:56:40 -07:00 committed by James Valleroy
parent cd512bd24c
commit df7e2e313f
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/freedombox.maintscript vendored
View File

@ -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/fail2ban/filter.d/matrix-auth-freedombox.conf 23.10~
rm_conffile /etc/apache2/conf-available/mediawiki-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/mediawiki/FreedomBoxStaticSettings.php 23.10~
rm_conffile /etc/apache2/conf-available/minidlna-freedombox.conf 23.10~

1
plinth/modules/mediawiki/__init__.py
View File

@ -154,7 +154,6 @@ def get_config():
create_permission = _get_config_value( create_permission = _get_config_value(
"$wgGroupPermissions['*']['createaccount']") "$wgGroupPermissions['*']['createaccount']")
read_permission = _get_config_value("$wgGroupPermissions['*']['read']") read_permission = _get_config_value("$wgGroupPermissions['*']['read']")
print('=====', create_permission, read_permission)
return { return {
'default_skin': _get_config_value('$wgDefaultSkin'), 'default_skin': _get_config_value('$wgDefaultSkin'),
'domain': urlparse(server_url).netloc, 'domain': urlparse(server_url).netloc,

8
plinth/modules/minidlna/__init__.py
View File

@ -6,6 +6,7 @@ from django.utils.translation import gettext_lazy as _
from plinth import app as app_module from plinth import app as app_module
from plinth import frontpage, menu from plinth import frontpage, menu
from plinth.config import DropinConfigs
from plinth.daemon import Daemon from plinth.daemon import Daemon
from plinth.modules import firewall from plinth.modules import firewall
from plinth.modules.apache.components import Webserver from plinth.modules.apache.components import Webserver
@ -34,7 +35,7 @@ class MiniDLNAApp(app_module.App):
app_id = 'minidlna' app_id = 'minidlna'
_version = 4 _version = 5
def __init__(self): def __init__(self):
"""Initialize the app components.""" """Initialize the app components."""
@ -71,6 +72,11 @@ class MiniDLNAApp(app_module.App):
packages = Packages('packages-minidlna', ['minidlna']) packages = Packages('packages-minidlna', ['minidlna'])
self.add(packages) 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'], firewall = Firewall('firewall-minidlna', info.name, ports=['minidlna'],
is_external=False) is_external=False)
self.add(firewall) self.add(firewall)

0
plinth/modules/minidlna/data/etc/apache2/conf-available/minidlna-freedombox.conf → plinth/modules/minidlna/data/usr/share/freedombox/etc/apache2/conf-available/minidlna-freedombox.conf
View File