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

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

Browse Source 
Tests:

- Config files are all symlinks in /etc/
- Web interface is accessible

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:46:52 -07:00 committed by James Valleroy
parent 6688ec9a20
commit 0bddd4bb54
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

@ -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-blog.setup 23.10~
rm_conffile /etc/ikiwiki/plinth-wiki.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/ikiwiki-plinth.conf 23.10~
rm_conffile /etc/apache2/conf-available/janus-freedombox.conf 23.10~

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

@ -8,6 +8,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.apache.components import Webserver from plinth.modules.apache.components import Webserver
from plinth.modules.backups.components import BackupRestore from plinth.modules.backups.components import BackupRestore
@ -32,7 +33,7 @@ class JanusApp(app_module.App):
app_id = 'janus' app_id = 'janus'
_version = 1 _version = 2
def __init__(self): def __init__(self):
"""Create components for the app.""" """Create components for the app."""
@ -64,6 +65,11 @@ class JanusApp(app_module.App):
]) ])
self.add(packages) 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, firewall = Firewall('firewall-janus', info.name,
ports=['http', 'https', ports=['http', 'https',
'janus-freedombox'], is_external=True) 'janus-freedombox'], is_external=True)

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