From f3bad4a88069d5db3ceaeb15444317280f9ca3ac Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 16 May 2023 13:41:58 -0700 Subject: [PATCH] sso: Use drop-in config component for /etc files Tests: - Config files are all symlinks in /etc/ - Single-sing-on for searx works Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- debian/freedombox.maintscript | 1 + plinth/modules/sso/__init__.py | 8 +++++++- .../etc/apache2/includes/freedombox-single-sign-on.conf | 0 3 files changed, 8 insertions(+), 1 deletion(-) rename plinth/modules/sso/data/{ => usr/share/freedombox}/etc/apache2/includes/freedombox-single-sign-on.conf (100%) diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript index 1d54dd5a9..f40b1c2fd 100644 --- a/debian/freedombox.maintscript +++ b/debian/freedombox.maintscript @@ -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/avahi/services/sftp-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~ diff --git a/plinth/modules/sso/__init__.py b/plinth/modules/sso/__init__.py index ed6e1a659..42753e7b3 100644 --- a/plinth/modules/sso/__init__.py +++ b/plinth/modules/sso/__init__.py @@ -4,6 +4,7 @@ from django.utils.translation import gettext_lazy as _ from plinth import app as app_module +from plinth.config import DropinConfigs from plinth.package import Packages from . import privileged @@ -14,7 +15,7 @@ class SSOApp(app_module.App): app_id = 'sso' - _version = 1 + _version = 2 def __init__(self): """Create components for the app.""" @@ -31,6 +32,11 @@ class SSOApp(app_module.App): ]) 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): """Install and configure the app.""" super().setup(old_version) diff --git a/plinth/modules/sso/data/etc/apache2/includes/freedombox-single-sign-on.conf b/plinth/modules/sso/data/usr/share/freedombox/etc/apache2/includes/freedombox-single-sign-on.conf similarity index 100% rename from plinth/modules/sso/data/etc/apache2/includes/freedombox-single-sign-on.conf rename to plinth/modules/sso/data/usr/share/freedombox/etc/apache2/includes/freedombox-single-sign-on.conf