mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-05-20 10:34:30 +00:00
searx: Use drop-in config component for /etc files
Tests: - Config files are all symlinks in /etc/ - Web interface works - Web interface authentication works Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
parent
4f0dd7733b
commit
500cfca6d4
2
debian/freedombox.maintscript
vendored
2
debian/freedombox.maintscript
vendored
@ -127,3 +127,5 @@ rm_conffile /etc/apache2/conf-available/radicale2-freedombox.conf 23.10~
|
|||||||
rm_conffile /etc/apache2/conf-available/roundcube-freedombox.conf 23.10~
|
rm_conffile /etc/apache2/conf-available/roundcube-freedombox.conf 23.10~
|
||||||
rm_conffile /etc/fail2ban/jail.d/roundcube-auth-freedombox.conf 23.10~
|
rm_conffile /etc/fail2ban/jail.d/roundcube-auth-freedombox.conf 23.10~
|
||||||
rm_conffile /etc/apache2/conf-available/rss-bridge.conf 23.10~
|
rm_conffile /etc/apache2/conf-available/rss-bridge.conf 23.10~
|
||||||
|
rm_conffile /etc/apache2/conf-available/searx-freedombox-auth.conf 23.10~
|
||||||
|
rm_conffile /etc/apache2/conf-available/searx-freedombox.conf 23.10~
|
||||||
|
|||||||
@ -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 frontpage, menu
|
from plinth import 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
|
||||||
@ -28,7 +29,7 @@ class SearxApp(app_module.App):
|
|||||||
|
|
||||||
app_id = 'searx'
|
app_id = 'searx'
|
||||||
|
|
||||||
_version = 5
|
_version = 6
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
"""Create components for the app."""
|
"""Create components for the app."""
|
||||||
@ -62,6 +63,12 @@ class SearxApp(app_module.App):
|
|||||||
packages = Packages('packages-searx', ['searx', 'libjs-bootstrap'])
|
packages = Packages('packages-searx', ['searx', 'libjs-bootstrap'])
|
||||||
self.add(packages)
|
self.add(packages)
|
||||||
|
|
||||||
|
dropin_configs = DropinConfigs('dropin-configs-searx', [
|
||||||
|
'/etc/apache2/conf-available/searx-freedombox-auth.conf',
|
||||||
|
'/etc/apache2/conf-available/searx-freedombox.conf',
|
||||||
|
])
|
||||||
|
self.add(dropin_configs)
|
||||||
|
|
||||||
firewall = Firewall('firewall-searx', info.name,
|
firewall = Firewall('firewall-searx', info.name,
|
||||||
ports=['http', 'https'], is_external=True)
|
ports=['http', 'https'], is_external=True)
|
||||||
self.add(firewall)
|
self.add(firewall)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user