diff options
| author | Holger Levsen <holger@layer-acht.org> | 2017-01-23 14:56:14 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-01-23 14:56:14 +0100 |
| commit | 60e1ba7c414b25995e66dd4426de60826da10b05 (patch) | |
| tree | 1dfe628a9ed2016c1467d788a8b53df3b5256373 /update_jdn.sh | |
| parent | 2e3d120a99fbe279c99ae3a46a7183a474077b79 (diff) | |
| download | jenkins.debian.net-60e1ba7c414b25995e66dd4426de60826da10b05.tar.xz | |
add check for controlmaster and controlpath defined in ~jenkins/.ssh/config
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'update_jdn.sh')
| -rwxr-xr-x | update_jdn.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/update_jdn.sh b/update_jdn.sh index abbced0e..463a65a0 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2012-2016 Holger Levsen <holger@layer-acht.org> +# Copyright 2012-2017 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 set -e @@ -546,6 +546,12 @@ if [ "$HOSTNAME" = "jenkins" ] ; then [ -L /var/www/userContent ] || sudo ln -sf /var/lib/jenkins/userContent /var/www/userContent sudo service apache2 reload fi + if ! grep controlmaster ~jenkins/.ssh/config || ! grep controlpath ~jenkins/.ssh/config ; then + echo + echo "Please define controlmaster and controlpath in ~jenkins/.ssh/config manually, see https://debian-administration.org/article/290/Reusing_existing_OpenSSH_v4_connections" + echo + exit 1 + fi fi if [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] || [ ! -f $STAMP ] ; then |