From a069ecafe76710cdc758f5c79a7c000bfe3a7e76 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Aug 2020 18:04:59 +0200
Subject: [systemd-distro] Get this module into working state, switch

---
 core/modules/sssd/module.build                   |  7 -------
 core/modules/sssd/module.conf                    | 10 +---------
 core/modules/sssd/templates/sssd-systemd.service | 16 ----------------
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 core/modules/sssd/templates/sssd-systemd.service

(limited to 'core/modules/sssd')

diff --git a/core/modules/sssd/module.build b/core/modules/sssd/module.build
index daa5a9c0..3f124d9c 100644
--- a/core/modules/sssd/module.build
+++ b/core/modules/sssd/module.build
@@ -9,13 +9,6 @@ build() {
 
 	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
-
-	local SSSD_PATH="$(which sssd)"
-	[ -z "$SSSD_PATH" ] && perror "'sssd' not found on this system. Should have been installed! Something is wrong..."
-
-	# Build nslcd service file
-	mkdir -p "${MODULE_BUILD_DIR}/etc/systemd/system"
-	sed "s,%PATH%,${SSSD_PATH},g" "${MODULE_DIR}/templates/sssd-systemd.service" > "${MODULE_BUILD_DIR}/etc/systemd/system/sssd.service" || perror "Could not fill sssd.service template"
 }
 
 post_copy() {
diff --git a/core/modules/sssd/module.conf b/core/modules/sssd/module.conf
index 461b3db9..93f1cee9 100644
--- a/core/modules/sssd/module.conf
+++ b/core/modules/sssd/module.conf
@@ -4,16 +4,8 @@ REQUIRED_BINARIES="
 "
 REQUIRED_FILES="
 	/etc/default/sssd
-	/etc/systemd/system/sssd.service
 "
-# lib/ is needed to fetch lib/x86..../security/pam_sss.so module
-# could do it using the SYS_PAM_MODULE_PATH, but using that in the
-# module.conf seems hacky...
-#
-# usr/lib is needed to get the ldb modules, e.g.:
-# 	usr/lib/x86_64-linux-gnu/ldb/modules/ldb/ldap.so
-#
 REQUIRED_DIRECTORIES="
 	/lib
-	/usr/lib
+	/usr
 "
diff --git a/core/modules/sssd/templates/sssd-systemd.service b/core/modules/sssd/templates/sssd-systemd.service
deleted file mode 100644
index c691759a..00000000
--- a/core/modules/sssd/templates/sssd-systemd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=System Security Services Daemon
-# SSSD will not be started until syslog is
-After=syslog.target
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/sssd
-ExecStartPre=/opt/openslx/scripts/systemd-patch_sssd_conf
-ExecStart=%PATH% -i -f
-# These two should be used with traditional UNIX forking daemons
-# consult systemd.service(5) for more details
-PIDFile=/var/run/sssd.pid
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit v1.2.3-55-g7522