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

Tests:

- Config files are all symlinks in /etc/
- LDAP auth works for /tt-rss-app/

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:50:43 -07:00 committed by James Valleroy
parent 4b5d1d3204
commit 73bc89b916
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 8 additions and 1 deletions

View File

@ -143,3 +143,4 @@ rm_conffile /etc/apt/apt.conf.d/20freedombox 23.10~
rm_conffile /etc/apt/apt.conf.d/20freedombox-allow-release-info-change 23.10~ rm_conffile /etc/apt/apt.conf.d/20freedombox-allow-release-info-change 23.10~
rm_conffile /etc/apt/apt.conf.d/60unattended-upgrades 23.10~ rm_conffile /etc/apt/apt.conf.d/60unattended-upgrades 23.10~
rm_conffile /etc/needrestart/conf.d/freedombox.conf 23.10~ rm_conffile /etc/needrestart/conf.d/freedombox.conf 23.10~
rm_conffile /etc/apache2/includes/freedombox-auth-ldap.conf 23.10~

View File

@ -9,6 +9,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, menu from plinth import cfg, menu
from plinth.config import DropinConfigs
from plinth.daemon import Daemon from plinth.daemon import Daemon
from plinth.package import Packages from plinth.package import Packages
from plinth.privileged import service as service_privileged from plinth.privileged import service as service_privileged
@ -42,7 +43,7 @@ class UsersApp(app_module.App):
app_id = 'users' app_id = 'users'
_version = 4 _version = 5
can_be_disabled = False can_be_disabled = False
@ -66,6 +67,11 @@ class UsersApp(app_module.App):
]) ])
self.add(packages) self.add(packages)
dropin_configs = DropinConfigs('dropin-configs-users', [
'/etc/apache2/includes/freedombox-auth-ldap.conf',
])
self.add(dropin_configs)
daemon = Daemon('daemon-users', 'slapd', listen_ports=[(389, 'tcp4'), daemon = Daemon('daemon-users', 'slapd', listen_ports=[(389, 'tcp4'),
(389, 'tcp6')]) (389, 'tcp6')])
self.add(daemon) self.add(daemon)