summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorFabiano Fidêncio <fidencio@redhat.com>2016-11-16 18:39:15 +0100
committerLukas Slebodnik <lslebodn@redhat.com>2017-01-23 18:46:37 +0100
commit61cd5c8307be4c4ac53028c4499b8bdd78e322b6 (patch)
tree90528d011793dcbaf7c1980dffa75e2d1c36199f /Makefile.am
parentb1829f05cf9bdc3d89c1058481281198ebc968d0 (diff)
downloadsssd-61cd5c8307be4c4ac53028c4499b8bdd78e322b6.tar.gz
sssd-61cd5c8307be4c4ac53028c4499b8bdd78e322b6.tar.xz
sssd-61cd5c8307be4c4ac53028c4499b8bdd78e322b6.zip
AUTOFS: Make AutoFS responder socket-activatable
As part of the effort of making all responders socket-activatable, let's make the AutoFS responder ready for this by providing its systemd's units. In case the administrators want to use AutoFS responder taking advantage of socket-activation they will need to enable sssd-autofs.socket and after a restart of the sssd service, the AutoFS socket will be ready waiting for any activity in order to start the AutoFS responder. Also, the AutoFS responder must be removed from the services line on sssd.conf. The AutoFS responder service is binded to the SSSD service, which means that the responder will be restarted in case SSSD is restarted and shutdown in case SSSD is shutdown/crashes. Related: https://fedorahosted.org/sssd/ticket/2243 Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> Reviewed-by: Pavel Březina <pbrezina@redhat.com> Reviewed-by: Jakub Hrozek <jhrozek@redhat.com> Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am30
1 files changed, 29 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index beff10bc3..0b32f7521 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3939,6 +3939,12 @@ if HAVE_SYSTEMD_UNIT
src/sysv/systemd/sssd-secrets.socket \
src/sysv/systemd/sssd-secrets.service \
$(NULL)
+if BUILD_AUTOFS
+ systemdunit_DATA += \
+ src/sysv/systemd/sssd-autofs.socket \
+ src/sysv/systemd/sssd-autofs.service \
+ $(NULL)
+endif
if WITH_JOURNALD
systemdconf_DATA += \
src/sysv/systemd/journal.conf
@@ -3976,8 +3982,11 @@ edit_cmd = $(SED) \
-e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@environment_file[@]|$(environment_file)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
+ -e 's|@logpath[@]|$(logpath)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \
- -e 's|@prefix[@]|$(prefix)|g'
+ -e 's|@pipepath[@]|$(pipepath)|g' \
+ -e 's|@prefix[@]|$(prefix)|g' \
+ -e 's|@SSSD_USER[@]|$(SSSD_USER)|g'
replace_script = \
@rm -f $@ $@.tmp; \
@@ -3993,6 +4002,13 @@ EXTRA_DIST += \
src/sysv/systemd/sssd-secrets.service.in \
$(NULL)
+if BUILD_AUTOFS
+EXTRA_DIST += \
+ src/sysv/systemd/sssd-autofs.socket.in \
+ src/sysv/systemd/sssd-autofs.service.in \
+ $(NULL)
+endif
+
src/sysv/systemd/sssd.service: src/sysv/systemd/sssd.service.in Makefile
@$(MKDIR_P) src/sysv/systemd/
$(replace_script)
@@ -4009,6 +4025,16 @@ src/sysv/systemd/sssd-secrets.service: src/sysv/systemd/sssd-secrets.service.in
@$(MKDIR_P) src/sysv/systemd/
$(replace_script)
+if BUILD_AUTOFS
+src/sysv/systemd/sssd-autofs.socket: src/sysv/systemd/sssd-autofs.socket.in Makefile
+ @$(MKDIR_P) src/sysv/systemd/
+ $(replace_script)
+
+src/sysv/systemd/sssd-autofs.service: src/sysv/systemd/sssd-autofs.service.in Makefile
+ @$(MKDIR_P) src/sysv/systemd/
+ $(replace_script)
+endif
+
SSSD_USER_DIRS = \
$(DESTDIR)$(dbpath) \
$(DESTDIR)$(keytabdir) \
@@ -4228,6 +4254,8 @@ endif
done;
rm -Rf ldb_mod_test_dir
rm -f $(builddir)/src/sysv/systemd/sssd.service
+ rm -f $(builddir)/src/sysv/systemd/sssd-autofs.socket
+ rm -f $(builddir)/src/sysv/systemd/sssd-autofs.service
rm -f $(builddir)/src/sysv/systemd/sssd-secrets.socket
rm -f $(builddir)/src/sysv/systemd/sssd-secrets.service
rm -f $(builddir)/src/sysv/systemd/journal.conf