diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-04-23 16:59:59 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-04-23 16:59:59 +0000 |
| commit | 1d13799acb033bf23a93151b7c48961601310adf (patch) | |
| tree | 62f5bbf12c893e08b7ee197661aece5def92bbeb /app-admin/sshguard/files | |
| parent | alpha/sparc/x86 stable wrt #361267 (diff) | |
| download | historical-1d13799acb033bf23a93151b7c48961601310adf.tar.gz historical-1d13799acb033bf23a93151b7c48961601310adf.tar.bz2 historical-1d13799acb033bf23a93151b7c48961601310adf.zip | |
Add --wait option to s-s-d to measure success or failure better.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686
Diffstat (limited to 'app-admin/sshguard/files')
| -rw-r--r-- | app-admin/sshguard/files/sshguard.confd | 6 | ||||
| -rw-r--r-- | app-admin/sshguard/files/sshguard.initd | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app-admin/sshguard/files/sshguard.confd b/app-admin/sshguard/files/sshguard.confd index 6acf6482f029..089367ea2e6b 100644 --- a/app-admin/sshguard/files/sshguard.confd +++ b/app-admin/sshguard/files/sshguard.confd @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.confd,v 1.2 2011/04/23 14:47:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.confd,v 1.3 2011/04/23 16:59:59 jer Exp $ # Config file for /etc/init.d/sshguard # See SSHGUARD(8) for details. @@ -16,3 +16,7 @@ SSHGUARD_OPTS="${SSHGUARD_OPTS} -l /var/log/auth.log" # -w <addr/host/block/file> #SSHGUARD_OPTS="${SSHGUARD_OPTS} -w 192.168.0.0/24" +# Define how long in milliseconds start-stop-daemon waits to check that +# sshguard is still running before calling success or failure. +# Values lower than the default of 999 are probably not useful. +SSHGUARD_WAIT="999" diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd index 1fa2e233b9e1..09711cd28c92 100644 --- a/app-admin/sshguard/files/sshguard.initd +++ b/app-admin/sshguard/files/sshguard.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.1 2011/04/23 14:44:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.2 2011/04/23 16:59:59 jer Exp $ : ${SSHGUARD_PIDFILE:='/var/run/sshguard.pid'} @@ -18,8 +18,9 @@ start() { done ebegin "Starting sshguard" - start-stop-daemon --start --background --quiet --exec /usr/sbin/sshguard -- \ - -i ${SSHGUARD_PIDFILE} ${LOGS} + [[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999 + start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet \ + --exec /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${LOGS} eend $? } |