From e6690c468fbc509bb5a58fa8571e64f305875318 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 10 Mar 2017 18:48:28 -0800 Subject: [PATCH] sys-auth/sssd: CoreOSify the service There is no need to fork the daemon with systemd, so run in the foreground for Type=simple. This also writes logs to stderr by default, so this service no longer needs a special /var/log path. The syslog.target unit does not exist either, but SSSD can can optionally query NSCD, so order it after nscd.service. --- .../coreos-overlay/sys-auth/sssd/files/sssd.service | 9 ++------- .../sys-auth/sssd/files/tmpfiles.d/sssd.conf | 1 - .../{sssd-1.13.1-r5.ebuild => sssd-1.13.1-r6.ebuild} | 0 3 files changed, 2 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/{sssd-1.13.1-r5.ebuild => sssd-1.13.1-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/sssd.service b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/sssd.service index 1821089a60..a6afb4682c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/sssd.service +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/sssd.service @@ -1,15 +1,10 @@ [Unit] Description=System Security Services Daemon -# SSSD will not be started until syslog is -After=syslog.target +After=nscd.service [Service] -ExecStart=/usr/sbin/sssd -D -f -# These two should be used with traditional UNIX forking daemons -# consult systemd.service(5) for more details -Type=forking +ExecStart=/usr/sbin/sssd -i PIDFile=/run/sssd.pid [Install] WantedBy=multi-user.target - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/tmpfiles.d/sssd.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/tmpfiles.d/sssd.conf index 6614bd6dbf..b93cb388c3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/tmpfiles.d/sssd.conf +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/files/tmpfiles.d/sssd.conf @@ -4,4 +4,3 @@ d /var/lib/sss - root root - - d /var/lib/sss/db 0700 root root - - d /var/lib/sss/pipes - root root - - d /var/lib/sss/pipes/private 0700 root root - - -d /var/log/sssd 0700 root root - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-1.13.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-1.13.1-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-1.13.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-1.13.1-r6.ebuild