mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-03-18 09:10:49 +00:00
matrixsynapse: Use drop-in config component for /etc files
Tests: - Config files are all symlinks in /etc/ - Login to Matrix using app.element.io works. - Fail2ban rules work Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
parent
0e82c58f1b
commit
c326b35238
3
debian/freedombox.maintscript
vendored
3
debian/freedombox.maintscript
vendored
@ -114,3 +114,6 @@ 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/janus-freedombox.conf 23.10~
|
||||
rm_conffile /etc/letsencrypt/renewal-hooks/deploy/50-freedombox 23.10~
|
||||
rm_conffile /etc/apache2/conf-available/matrix-synapse-plinth.conf 23.10~
|
||||
rm_conffile /etc/fail2ban/jail.d/matrix-auth-freedombox.conf 23.10~
|
||||
rm_conffile /etc/fail2ban/filter.d/matrix-auth-freedombox.conf 23.10~
|
||||
|
||||
@ -11,6 +11,7 @@ from ruamel.yaml.util import load_yaml_guess_indent
|
||||
|
||||
from plinth import app as app_module
|
||||
from plinth import frontpage, menu
|
||||
from plinth.config import DropinConfigs
|
||||
from plinth.daemon import Daemon
|
||||
from plinth.modules.apache.components import Webserver
|
||||
from plinth.modules.backups.components import BackupRestore
|
||||
@ -44,7 +45,7 @@ class MatrixSynapseApp(app_module.App):
|
||||
|
||||
app_id = 'matrixsynapse'
|
||||
|
||||
_version = 8
|
||||
_version = 9
|
||||
|
||||
def __init__(self):
|
||||
"""Create components for the app."""
|
||||
@ -77,6 +78,13 @@ class MatrixSynapseApp(app_module.App):
|
||||
['matrix-synapse', 'matrix-synapse-ldap3', 'python3-psycopg2'])
|
||||
self.add(packages)
|
||||
|
||||
dropin_configs = DropinConfigs('dropin-configs-matrixsynapse', [
|
||||
'/etc/apache2/conf-available/matrix-synapse-plinth.conf',
|
||||
'/etc/fail2ban/jail.d/matrix-auth-freedombox.conf',
|
||||
'/etc/fail2ban/filter.d/matrix-auth-freedombox.conf',
|
||||
])
|
||||
self.add(dropin_configs)
|
||||
|
||||
firewall = Firewall('firewall-matrixsynapse', info.name,
|
||||
ports=['matrix-synapse-plinth'], is_external=True)
|
||||
self.add(firewall)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user