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

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

Browse Source 
Tests:

- Config files are all symlinks in /etc/
- Single-sing-on for searx 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 13:41:58 -07:00 committed by James Valleroy
parent e019f76b40
commit f3bad4a880
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

@ -135,3 +135,4 @@ rm_conffile /etc/apache2/includes/freedombox-sharing.conf 23.10~
rm_conffile /etc/fail2ban/jail.d/ssh-freedombox.conf 23.10~ rm_conffile /etc/fail2ban/jail.d/ssh-freedombox.conf 23.10~
rm_conffile /etc/avahi/services/sftp-ssh.service 23.10~ rm_conffile /etc/avahi/services/sftp-ssh.service 23.10~
rm_conffile /etc/avahi/services/ssh.service 23.10~ rm_conffile /etc/avahi/services/ssh.service 23.10~
rm_conffile /etc/apache2/includes/freedombox-single-sign-on.conf 23.10~

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

@ -4,6 +4,7 @@
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from plinth import app as app_module from plinth import app as app_module
from plinth.config import DropinConfigs
from plinth.package import Packages from plinth.package import Packages
from . import privileged from . import privileged
@ -14,7 +15,7 @@ class SSOApp(app_module.App):
app_id = 'sso' app_id = 'sso'
_version = 1 _version = 2
def __init__(self): def __init__(self):
"""Create components for the app.""" """Create components for the app."""
@ -31,6 +32,11 @@ class SSOApp(app_module.App):
]) ])
self.add(packages) self.add(packages)
dropin_configs = DropinConfigs('dropin-configs-sso', [
'/etc/apache2/includes/freedombox-single-sign-on.conf',
])
self.add(dropin_configs)
def setup(self, old_version): def setup(self, old_version):
"""Install and configure the app.""" """Install and configure the app."""
super().setup(old_version) super().setup(old_version)

0
plinth/modules/sso/data/etc/apache2/includes/freedombox-single-sign-on.conf → plinth/modules/sso/data/usr/share/freedombox/etc/apache2/includes/freedombox-single-sign-on.conf
View File