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

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

Browse Source 
Tests:

- Config files are all symlinks in /etc/
- calibre web interface is available

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 13:58:24 -07:00 committed by James Valleroy
parent 1060d733a7
commit 98be58eb41
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

@ -91,6 +91,7 @@ rm_conffile /etc/apache2/conf-available/php-fpm-freedombox.conf 23.10~
rm_conffile /etc/fail2ban/jail.d/apache-auth-freedombox.conf 23.10~ rm_conffile /etc/fail2ban/jail.d/apache-auth-freedombox.conf 23.10~
rm_conffile /etc/apache2/conf-available/bepasty-freedombox.conf 23.10~ rm_conffile /etc/apache2/conf-available/bepasty-freedombox.conf 23.10~
rm_conffile /etc/uwsgi/apps-available/bepasty-freedombox.ini 23.10~ rm_conffile /etc/uwsgi/apps-available/bepasty-freedombox.ini 23.10~
rm_conffile /etc/apache2/conf-available/calibre-freedombox.conf 23.10~
rm_conffile /etc/apache2/conf-available/deluge-plinth.conf 23.10~ rm_conffile /etc/apache2/conf-available/deluge-plinth.conf 23.10~
rm_conffile /etc/dovecot/conf.d/15-freedombox-mail.conf 23.10~ rm_conffile /etc/dovecot/conf.d/15-freedombox-mail.conf 23.10~
rm_conffile /etc/dovecot/conf.d/05-freedombox-passdb.conf 23.10~ rm_conffile /etc/dovecot/conf.d/05-freedombox-passdb.conf 23.10~

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

@ -7,6 +7,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.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
@ -41,7 +42,7 @@ class CalibreApp(app_module.App):
app_id = 'calibre' app_id = 'calibre'
_version = 2 _version = 3
DAEMON = 'calibre-server-freedombox' DAEMON = 'calibre-server-freedombox'
@ -75,6 +76,11 @@ class CalibreApp(app_module.App):
packages = Packages('packages-calibre', ['calibre']) packages = Packages('packages-calibre', ['calibre'])
self.add(packages) self.add(packages)
dropin_configs = DropinConfigs('dropin-configs-calibre', [
'/etc/apache2/conf-available/calibre-freedombox.conf',
])
self.add(dropin_configs)
firewall = Firewall('firewall-calibre', info.name, firewall = Firewall('firewall-calibre', info.name,
ports=['http', 'https'], is_external=True) ports=['http', 'https'], is_external=True)
self.add(firewall) self.add(firewall)

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