From e0ade8d1e00d577686f893e0059def5866dcb9f6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 20 Jun 2013 10:12:00 -0400 Subject: Configure SYSV init scripts properly Previously, these contained hard-coded paths. Now they are populated correctly by the configure script. https://fedorahosted.org/sssd/ticket/1986 --- configure.ac | 4 +- src/sysv/SUSE/sssd | 78 ----------------------------- src/sysv/SUSE/sssd.in | 77 ++++++++++++++++++++++++++++ src/sysv/gentoo/sssd | 18 ------- src/sysv/gentoo/sssd.in | 18 +++++++ src/sysv/sssd | 130 ------------------------------------------------ src/sysv/sssd.in | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 227 insertions(+), 227 deletions(-) delete mode 100644 src/sysv/SUSE/sssd create mode 100644 src/sysv/SUSE/sssd.in delete mode 100644 src/sysv/gentoo/sssd create mode 100644 src/sysv/gentoo/sssd.in delete mode 100644 src/sysv/sssd create mode 100644 src/sysv/sssd.in diff --git a/configure.ac b/configure.ac index 7eeee2e2a..3417ba877 100644 --- a/configure.ac +++ b/configure.ac @@ -285,7 +285,9 @@ AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the bu AC_SUBST([abs_builddir], $abs_build_dir) AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config - src/sysv/systemd/sssd.service po/Makefile.in src/man/Makefile + src/sysv/systemd/sssd.service src/sysv/sssd + src/sysv/gentoo/sssd src/sysv/SUSE/sssd + po/Makefile.in src/man/Makefile src/providers/ipa/ipa_hbac.pc src/providers/ipa/ipa_hbac.doxy src/lib/idmap/sss_idmap.pc src/lib/idmap/sss_idmap.doxy src/sss_client/sudo/sss_sudo.doxy diff --git a/src/sysv/SUSE/sssd b/src/sysv/SUSE/sssd deleted file mode 100644 index 2f98c2164..000000000 --- a/src/sysv/SUSE/sssd +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: sssd -# Required-Start: $remote_fs $time -# Should-Start: $syslog -# Should-Stop: $syslog -# Required-Stop: $remote_fs -# Default-Start: 3 5 -# Default-Stop: 0 1 2 4 6 -# Short-Description: System Security Services Daemon -# Description: Provides a set of daemons to manage access to remote directories -# and authentication mechanisms. It provides an NSS and PAM -# interface toward the system and a pluggable backend system to -# connect to multiple different account sources. It is also the -# basis to provide client auditing and policy services for projects -# like FreeIPA. -### END INIT INFO - -RETVAL=0 -prog="sssd" - -# Source function library. -. /etc/rc.status -rc_reset - -SSSD=/usr/sbin/sssd -PID_FILE=/var/run/sssd.pid - -case "$1" in - start) - echo -n "Starting $prog " - /sbin/startproc $SSSD -f -D 2>/dev/null - rc_status -v - ;; - - stop) - echo -n "Shutting down $prog " - /sbin/killproc -p $PID_FILE $SSSD -TERM - rc_status -v - ;; - - restart) - $0 stop - $0 start - rc_status - ;; - - reload) - echo -n "Reload service $prog " - killproc $SSSD -HUP - rc_status -v - ;; - - force-reload) - $0 reload - ;; - - status) - echo -n "Checking for service $prog" - /sbin/checkproc $SSSD - rc_status -v - ;; - - condrestart|try-restart) - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - rc_status - ;; - *) - echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 1 -esac -rc_exit - diff --git a/src/sysv/SUSE/sssd.in b/src/sysv/SUSE/sssd.in new file mode 100644 index 000000000..04d302313 --- /dev/null +++ b/src/sysv/SUSE/sssd.in @@ -0,0 +1,77 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: sssd +# Required-Start: $remote_fs $time +# Should-Start: $syslog +# Should-Stop: $syslog +# Required-Stop: $remote_fs +# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 +# Short-Description: System Security Services Daemon +# Description: Provides a set of daemons to manage access to remote directories +# and authentication mechanisms. It provides an NSS and PAM +# interface toward the system and a pluggable backend system to +# connect to multiple different account sources. It is also the +# basis to provide client auditing and policy services for projects +# like FreeIPA. +### END INIT INFO + +RETVAL=0 +prog="sssd" + +# Source function library. +. /etc/rc.status +rc_reset + +SSSD=@sbindir@/sssd +PID_FILE=@localstatedir@/run/sssd.pid + +case "$1" in + start) + echo -n "Starting $prog " + /sbin/startproc $SSSD -f -D 2>/dev/null + rc_status -v + ;; + + stop) + echo -n "Shutting down $prog " + /sbin/killproc -p $PID_FILE $SSSD -TERM + rc_status -v + ;; + + restart) + $0 stop + $0 start + rc_status + ;; + + reload) + echo -n "Reload service $prog " + killproc $SSSD -HUP + rc_status -v + ;; + + force-reload) + $0 reload + ;; + + status) + echo -n "Checking for service $prog" + /sbin/checkproc $SSSD + rc_status -v + ;; + + condrestart|try-restart) + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + rc_status + ;; + *) + echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 1 +esac +rc_exit diff --git a/src/sysv/gentoo/sssd b/src/sysv/gentoo/sssd deleted file mode 100644 index cbaedfd5d..000000000 --- a/src/sysv/gentoo/sssd +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/runscript - -depend(){ - need localmount netmount clock - use syslog -} - -start(){ - ebegin "Starting sssd" - start-stop-daemon --start --exec /usr/sbin/sssd -- -D - eend ${?} -} - -stop(){ - ebegin "Stopping sssd" - start-stop-daemon --stop --pidfile /var/run/sssd.pid - eend ${?} -} diff --git a/src/sysv/gentoo/sssd.in b/src/sysv/gentoo/sssd.in new file mode 100644 index 000000000..8007b644a --- /dev/null +++ b/src/sysv/gentoo/sssd.in @@ -0,0 +1,18 @@ +#!/sbin/runscript + +depend(){ + need localmount netmount clock + use syslog +} + +start(){ + ebegin "Starting sssd" + start-stop-daemon --start --exec @sbindir@/sssd -- -D + eend ${?} +} + +stop(){ + ebegin "Stopping sssd" + start-stop-daemon --stop --pidfile @localstatedir@/run/sssd.pid + eend ${?} +} diff --git a/src/sysv/sssd b/src/sysv/sssd deleted file mode 100644 index ca929e9ec..000000000 --- a/src/sysv/sssd +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh -# -# -# chkconfig: - 12 88 -# description: Provides a set of daemons to manage access to remote directories -# and authentication mechanisms. It provides an NSS and PAM -# interface toward the system and a pluggable backend system to -# connect to multiple different account sources. It is also the -# basis to provide client auditing and policy services for projects -# like FreeIPA. -# -### BEGIN INIT INFO -# Provides: sssd -# Required-Start: $remote_fs $time -# Should-Start: $syslog -# Should-Stop: $null -# Required-Stop: $null -# Default-Stop: 0 1 6 -# Short-Description: System Security Services Daemon -# Description: Provides a set of daemons to manage access to remote directories -# and authentication mechanisms. It provides an NSS and PAM -# interface toward the system and a pluggable backend system to -# connect to multiple different account sources. It is also the -# basis to provide client auditing and policy services for projects -# like FreeIPA. -### END INIT INFO - -RETVAL=0 -prog="sssd" - -# Source function library. -. /etc/init.d/functions - -SSSD=/usr/sbin/sssd - -LOCK_FILE=/var/lock/subsys/sssd -PID_FILE=/var/run/sssd.pid - -start() { - [ -x $SSSD ] || exit 5 - echo -n $"Starting $prog: " - daemon $SSSD -f -D && success || failure - RETVAL=$? - echo - [ "$RETVAL" = 0 ] && touch $LOCK_FILE - return $RETVAL -} - -stop() { - echo -n $"Stopping $prog: " - pid=`cat $PID_FILE` - - killproc -p $PID_FILE $SSSD -TERM - RETVAL=$? - - # Wait until the monitor exits - while (checkpid $pid) - do - usleep 100000 - done - - echo - [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE - return $RETVAL -} - -reload() { - echo -n $"Reloading $prog: " - killproc $SSSD -HUP - RETVAL=$? - echo - return $RETVAL -} - -restart() { - stop - start -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - - stop) - rh_status_q || exit 0 - $1 - ;; - - restart) - $1 - ;; - - reload) - rh_status_q || exit 7 - $1 - ;; - - force-reload) - force_reload - ;; - - status) - rh_status - ;; - - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/src/sysv/sssd.in b/src/sysv/sssd.in new file mode 100644 index 000000000..8a344be7f --- /dev/null +++ b/src/sysv/sssd.in @@ -0,0 +1,129 @@ +#!/bin/sh +# +# +# chkconfig: - 12 88 +# description: Provides a set of daemons to manage access to remote directories +# and authentication mechanisms. It provides an NSS and PAM +# interface toward the system and a pluggable backend system to +# connect to multiple different account sources. It is also the +# basis to provide client auditing and policy services for projects +# like FreeIPA. +# +### BEGIN INIT INFO +# Provides: sssd +# Required-Start: $remote_fs $time +# Should-Start: $syslog +# Should-Stop: $null +# Required-Stop: $null +# Default-Stop: 0 1 6 +# Short-Description: System Security Services Daemon +# Description: Provides a set of daemons to manage access to remote directories +# and authentication mechanisms. It provides an NSS and PAM +# interface toward the system and a pluggable backend system to +# connect to multiple different account sources. It is also the +# basis to provide client auditing and policy services for projects +# like FreeIPA. +### END INIT INFO + +RETVAL=0 +prog="sssd" + +# Source function library. +. /etc/init.d/functions + +SSSD=@sbindir@/sssd + +LOCK_FILE=@localstatedir@/lock/subsys/sssd +PID_FILE=@localstatedir@/run/sssd.pid + +start() { + [ -x $SSSD ] || exit 5 + echo -n $"Starting $prog: " + daemon $SSSD -f -D && success || failure + RETVAL=$? + echo + [ "$RETVAL" = 0 ] && touch $LOCK_FILE + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + pid=`cat $PID_FILE` + + killproc -p $PID_FILE $SSSD -TERM + RETVAL=$? + + # Wait until the monitor exits + while (checkpid $pid) + do + usleep 100000 + done + + echo + [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE + return $RETVAL +} + +reload() { + echo -n $"Reloading $prog: " + killproc $SSSD -HUP + RETVAL=$? + echo + return $RETVAL +} + +restart() { + stop + start +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + + stop) + rh_status_q || exit 0 + $1 + ;; + + restart) + $1 + ;; + + reload) + rh_status_q || exit 7 + $1 + ;; + + force-reload) + force_reload + ;; + + status) + rh_status + ;; + + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? -- cgit