diff --git a/base/univention-base-files/conffiles/etc/init.d/cron b/base/univention-base-files/conffiles/etc/init.d/cron index 0a90b3f..0507597 100755 --- a/base/univention-base-files/conffiles/etc/init.d/cron +++ b/base/univention-base-files/conffiles/etc/init.d/cron @@ -2,6 +2,7 @@ @%@UCRWARNING=# @%@ # Start/stop the cron daemon. # +# pidfile: /var/run/crond.pid ### BEGIN INIT INFO # Provides: cron # Required-Start: $remote_fs $syslog $time diff --git a/base/univention-base-files/conffiles/etc/init.d/nscd b/base/univention-base-files/conffiles/etc/init.d/nscd index e2c9085..a2f57f1 100755 --- a/base/univention-base-files/conffiles/etc/init.d/nscd +++ b/base/univention-base-files/conffiles/etc/init.d/nscd @@ -1,5 +1,6 @@ #!/bin/sh @%@UCRWARNING=# @%@ +# pidfile: /var/run/nscd/nscd.pid ### BEGIN INIT INFO # Provides: nscd # Required-Start: $remote_fs $syslog diff --git a/base/univention-base-files/conffiles/etc/init.d/ntp b/base/univention-base-files/conffiles/etc/init.d/ntp index 766ef5c..d8122e8 100755 --- a/base/univention-base-files/conffiles/etc/init.d/ntp +++ b/base/univention-base-files/conffiles/etc/init.d/ntp @@ -1,6 +1,7 @@ #!/bin/sh @%@UCRWARNING=# @%@ +# pidfile: /var/run/ntpd.pid ### BEGIN INIT INFO # Provides: ntp # Required-Start: $network $remote_fs $syslog diff --git a/base/univention-base-files/conffiles/etc/init.d/openbsd-inetd b/base/univention-base-files/conffiles/etc/init.d/openbsd-inetd index ca601c7..6507995 100755 --- a/base/univention-base-files/conffiles/etc/init.d/openbsd-inetd +++ b/base/univention-base-files/conffiles/etc/init.d/openbsd-inetd @@ -1,6 +1,7 @@ #!/bin/sh -e @%@UCRWARNING=# @%@ +# pidfile: /var/run/inetd.pid ### BEGIN INIT INFO # Provides: openbsd-inetd # Required-Start: $local_fs $remote_fs diff --git a/base/univention-base-files/conffiles/etc/init.d/rpcbind b/base/univention-base-files/conffiles/etc/init.d/rpcbind index fe1e64f..2b6a9f3 100755 --- a/base/univention-base-files/conffiles/etc/init.d/rpcbind +++ b/base/univention-base-files/conffiles/etc/init.d/rpcbind @@ -3,6 +3,7 @@ # # start/stop rpcbind daemon. +# pidfile: /run/rpcbind.pid ### BEGIN INIT INFO # Provides: rpcbind # Required-Start: $network $local_fs diff --git a/base/univention-bootsplash/debian/univention-welcome-screen.init b/base/univention-bootsplash/debian/univention-welcome-screen.init index be16cbf..b0df43c 100755 --- a/base/univention-bootsplash/debian/univention-welcome-screen.init +++ b/base/univention-bootsplash/debian/univention-welcome-screen.init @@ -1,4 +1,5 @@ #!/bin/bash +# pidfile: /var/run/univention-welcome-screen.pid ### BEGIN INIT INFO # Provides: univention-welcome-screen # Required-Start: $local_fs diff --git a/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc b/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc index 49b1af6..a06aae5 100755 --- a/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc +++ b/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc @@ -2,6 +2,7 @@ @%@UCRWARNING=# @%@ +# pidfile: /var/run/heimdal-kdc.pid ### BEGIN INIT INFO # Provides: heimdal-kdc # Required-Start: $remote_fs $syslog diff --git a/base/univention-runit/debian/univention-runit.init b/base/univention-runit/debian/univention-runit.init index b1bdd53..ec2e259 100644 --- a/base/univention-runit/debian/univention-runit.init +++ b/base/univention-runit/debian/univention-runit.init @@ -1,4 +1,5 @@ #!/bin/sh +# pidfile: /var/run/univention-runit.pid ### BEGIN INIT INFO # Provides: univention-runit # Required-Start: $local_fs @@ -39,27 +40,28 @@ NAME='univention-runit' DESC=$(get_lsb_header_val "$0" Short-Description) DAEMON="/usr/sbin/runsvdir-start" +PIDFILE='/var/run/univention-runit.pid' case "$1" in start) log_daemon_msg "Starting $DESC" "$NAME" - start-stop-daemon --start --background --exec "$DAEMON" + start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --make-pidfile --background --exec "$DAEMON" log_end_msg $? ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" - killall -s HUP runsvdir + start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE" --remove-pidfile --retry HUP/30/KILL/5 --name runsvdir log_end_msg $? ;; restart|force-reload) log_daemon_msg "Restarting $DESC" "$NAME" - killall -s HUP runsvdir + start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE" --remove-pidfile --retry HUP/30/KILL/5 --name runsvdir sleep 1 - start-stop-daemon --start --background --exec "$DAEMON" + start-stop-daemon --start --quiet --pidfile "$PIDFILE" --make-pidfile --background --exec "$DAEMON" log_end_msg $? ;; status) - status_of_proc "$DAEMON" "$DESC" + status_of_proc -p "$PIDFILE" "$DAEMON" "$DESC" ;; *) echo "Usage: $0 {start|stop|restart|force-reload|status}" diff --git a/container/univention-docker/conffiles/etc/init.d/docker b/container/univention-docker/conffiles/etc/init.d/docker index cc2ea7a..a39fd81 100755 --- a/container/univention-docker/conffiles/etc/init.d/docker +++ b/container/univention-docker/conffiles/etc/init.d/docker @@ -1,6 +1,7 @@ #!/bin/sh @%@UCRWARNING=# @%@ +# pidfile: /var/run/docker.pid ### BEGIN INIT INFO # Provides: docker # Required-Start: $syslog $remote_fs diff --git a/doc/developer-reference/ucr/service/conffiles/etc/init.d/atd b/doc/developer-reference/ucr/service/conffiles/etc/init.d/atd index c5934e2..e1a0c62 100755 --- a/doc/developer-reference/ucr/service/conffiles/etc/init.d/atd +++ b/doc/developer-reference/ucr/service/conffiles/etc/init.d/atd @@ -1,5 +1,6 @@ #! /bin/sh @%@UCRWARNING=# @%@ +# pidfile: /var/run/atd.pid ### BEGIN INIT INFO # Provides: atd # Required-Start: $syslog $time $remote_fs diff --git a/mail/univention-mail-dovecot/conffiles/etc/init.d/dovecot b/mail/univention-mail-dovecot/conffiles/etc/init.d/dovecot index 6a6a6c1..bf90a71 100755 --- a/mail/univention-mail-dovecot/conffiles/etc/init.d/dovecot +++ b/mail/univention-mail-dovecot/conffiles/etc/init.d/dovecot @@ -1,6 +1,7 @@ #! /bin/sh @%@UCRWARNING=# @%@ +# pidfile: /var/run/dovecot/master.pid ### BEGIN INIT INFO # Provides: dovecot # Required-Start: $local_fs $remote_fs $network $syslog $time diff --git a/mail/univention-mail-postfix/conffiles/etc/init.d/postfix b/mail/univention-mail-postfix/conffiles/etc/init.d/postfix index ab6731b..bc95096 100755 --- a/mail/univention-mail-postfix/conffiles/etc/init.d/postfix +++ b/mail/univention-mail-postfix/conffiles/etc/init.d/postfix @@ -7,6 +7,7 @@ # LaMont Jones # based on sendmail's init.d script +# pidfile: /var/spool/postfix/pid/master.pid ### BEGIN INIT INFO # Provides: postfix mail-transport-agent # Required-Start: $local_fs $remote_fs $syslog $named $network $time diff --git a/mail/univention-postgrey/conffiles/etc/init.d/postgrey b/mail/univention-postgrey/conffiles/etc/init.d/postgrey index f032eb0..a0dc0b0 100755 --- a/mail/univention-postgrey/conffiles/etc/init.d/postgrey +++ b/mail/univention-postgrey/conffiles/etc/init.d/postgrey @@ -41,6 +41,7 @@ # # Version: $Id: postgrey.init 1436 2006-12-07 07:15:03Z avbidder $ # +# pidfile: /var/run/postgrey.pid ### BEGIN INIT INFO # Provides: postgrey # Required-Start: $syslog $local_fs $remote_fs diff --git a/management/univention-management-console/debian/univention-management-console-server.init b/management/univention-management-console/debian/univention-management-console-server.init index c803bb9..6b56d7d 100644 --- a/management/univention-management-console/debian/univention-management-console-server.init +++ b/management/univention-management-console/debian/univention-management-console-server.init @@ -1,4 +1,5 @@ #!/bin/sh +# pidfile: /var/run/umc-server.pid ### BEGIN INIT INFO # Provides: univention-management-console-server # Required-Start: $network $remote_fs diff --git a/management/univention-management-console/debian/univention-management-console-web-server.init b/management/univention-management-console/debian/univention-management-console-web-server.init index c6e0710..10bde25 100644 --- a/management/univention-management-console/debian/univention-management-console-web-server.init +++ b/management/univention-management-console/debian/univention-management-console-web-server.init @@ -1,4 +1,5 @@ #!/bin/sh +# pidfile: /var/run/umc-web-server.pid ### BEGIN INIT INFO # Provides: univention-management-console-web-server # Required-Start: $network $remote_fs univention-management-console-server diff --git a/nagios/univention-nagios/conffiles/etc/init.d/nagios-nrpe-server b/nagios/univention-nagios/conffiles/etc/init.d/nagios-nrpe-server index 1e062af..6839878 100755 --- a/nagios/univention-nagios/conffiles/etc/init.d/nagios-nrpe-server +++ b/nagios/univention-nagios/conffiles/etc/init.d/nagios-nrpe-server @@ -1,7 +1,7 @@ #! /bin/sh -# @%@UCRWARNING=# @%@ +# pidfile: /var/run/nagios/nrpe.pid ### BEGIN INIT INFO # Provides: nagios-nrpe-server # Required-Start: $local_fs $remote_fs $syslog $named $network $time diff --git a/nagios/univention-nagios/conffiles/etc/init.d/nagios3 b/nagios/univention-nagios/conffiles/etc/init.d/nagios3 index e27d1c7..2c4e0de 100644 --- a/nagios/univention-nagios/conffiles/etc/init.d/nagios3 +++ b/nagios/univention-nagios/conffiles/etc/init.d/nagios3 @@ -8,6 +8,7 @@ # Nagios version by Sean Finney and probably others # nagios2 version by Marc Haber +# pidfile: /var/run/nagios3/nagios3.pid ### BEGIN INIT INFO # Provides: nagios3 # Required-Start: $local_fs $remote_fs $syslog $named $network $time diff --git a/services/univention-ad-connector/debian/univention-ad-connector.init b/services/univention-ad-connector/debian/univention-ad-connector.init index 1b9d0a3..a9d2061 100644 --- a/services/univention-ad-connector/debian/univention-ad-connector.init +++ b/services/univention-ad-connector/debian/univention-ad-connector.init @@ -1,4 +1,5 @@ #!/bin/sh +# pidfile: /var/run/univention-ad-connector ### BEGIN INIT INFO # Provides: univention-ad-connector # Required-Start: $network $remote_fs slapd diff --git a/services/univention-net-installer/debian/univention-net-installer-daemon.init.d b/services/univention-net-installer/debian/univention-net-installer-daemon.init.d index 6b94202..26ba60e 100644 --- a/services/univention-net-installer/debian/univention-net-installer-daemon.init.d +++ b/services/univention-net-installer/debian/univention-net-installer-daemon.init.d @@ -29,6 +29,7 @@ # /usr/share/common-licenses/AGPL-3; if not, see # . # +# pidfile: /var/run/univention-net-installer-daemon.pid ### BEGIN INIT INFO # Provides: univention-net-installer-daemon # Required-Start: $network $local_fs diff --git a/services/univention-s4-connector/debian/univention-s4-connector.init b/services/univention-s4-connector/debian/univention-s4-connector.init index 214c334..8d176ef 100644 --- a/services/univention-s4-connector/debian/univention-s4-connector.init +++ b/services/univention-s4-connector/debian/univention-s4-connector.init @@ -1,4 +1,5 @@ #!/bin/sh +# pidfile: /var/run/univention-s4-connector ### BEGIN INIT INFO # Provides: univention-s4-connector # Required-Start: $network $remote_fs slapd samba-ad-dc diff --git a/services/univention-samba/conffiles/etc/init.d/samba b/services/univention-samba/conffiles/etc/init.d/samba index f4025f3..8284fbb 100755 --- a/services/univention-samba/conffiles/etc/init.d/samba +++ b/services/univention-samba/conffiles/etc/init.d/samba @@ -4,6 +4,7 @@ # Written by Debian Samba Maintainers # Modified for UCS by Univention +# pidfile: /var/run/samba/smbd.pid ### BEGIN INIT INFO # Provides: samba # Required-Start: $network $local_fs $remote_fs diff --git a/virtualization/univention-novnc/debian/univention-novnc.init b/virtualization/univention-novnc/debian/univention-novnc.init index 688d0ff..36e1788 100644 --- a/virtualization/univention-novnc/debian/univention-novnc.init +++ b/virtualization/univention-novnc/debian/univention-novnc.init @@ -1,4 +1,5 @@ #!/bin/sh +# pidfile: /var/run/univention-novnc.pid ### BEGIN INIT INFO # Provides: univention-novnc # Required-Start: $network $local_fs