nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Tests:

- Config files are all symlinks in /etc/
- Web interface works.

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 12:03:59 -07:00 committed by James Valleroy
parent 8533a287a6
commit 23f7497c05
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/freedombox.maintscript vendored
View File

@ -123,3 +123,4 @@ rm_conffile /etc/apache2/conf-available/minidlna-freedombox.conf 23.10~
rm_conffile /etc/NetworkManager/dispatcher.d/10-freedombox-batman 23.10~ rm_conffile /etc/NetworkManager/dispatcher.d/10-freedombox-batman 23.10~
rm_conffile /etc/pagekite.d/90_freedombox_certs.rc 23.10~ rm_conffile /etc/pagekite.d/90_freedombox_certs.rc 23.10~
rm_conffile /etc/dpkg/origins/freedombox 23.10~ rm_conffile /etc/dpkg/origins/freedombox 23.10~
rm_conffile /etc/apache2/conf-available/radicale2-freedombox.conf 23.10~

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

@ -10,6 +10,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 cfg, frontpage, menu from plinth import cfg, frontpage, menu
from plinth.config import DropinConfigs
from plinth.modules.apache.components import Uwsgi, Webserver from plinth.modules.apache.components import Uwsgi, Webserver
from plinth.modules.backups.components import BackupRestore from plinth.modules.backups.components import BackupRestore
from plinth.modules.firewall.components import Firewall from plinth.modules.firewall.components import Firewall
@ -42,7 +43,7 @@ class RadicaleApp(app_module.App):
app_id = 'radicale' app_id = 'radicale'
_version = 2 _version = 3
def __init__(self): def __init__(self):
"""Create components for the app.""" """Create components for the app."""
@ -71,6 +72,11 @@ class RadicaleApp(app_module.App):
packages = Packages('packages-radicale', ['radicale']) packages = Packages('packages-radicale', ['radicale'])
self.add(packages) self.add(packages)
dropin_configs = DropinConfigs('dropin-configs-radicale', [
'/etc/apache2/conf-available/radicale2-freedombox.conf',
])
self.add(dropin_configs)
firewall = Firewall('firewall-radicale', info.name, firewall = Firewall('firewall-radicale', info.name,
ports=['http', 'https'], is_external=True) ports=['http', 'https'], is_external=True)
self.add(firewall) self.add(firewall)

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