[Qa-jenkins-scm] [jenkins.debian.net] 01/01: update_jdn: configure sshd as we want it

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit b6e388324943e0c545c1f9d994b5b52375677d7d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jul 17 13:05:29 2016 +0200

    update_jdn: configure sshd as we want it
---
 update_jdn.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/update_jdn.sh b/update_jdn.sh
index 8c10e74..3b6126f 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -101,10 +101,16 @@ $UP2DATE || for user in ${users}; do
 	fi
 done
 
+# change defaults
 $UP2DATE || grep -q '^AuthorizedKeysFile' /etc/ssh/sshd_config || {
 	sudo sh -c "echo 'AuthorizedKeysFile /var/lib/misc/userkeys/%u %h/.ssh/authorized_keys' >> /etc/ssh/sshd_config"
 	sudo service ssh reload
 }
+# change vagrants manual configuration on some armhf hosts
+$UP2DATE || grep -q '/var/lib/misc/userkeys' /etc/ssh/sshd_config || {
+	sudo sed -i "s#/var/lib/monkeysphere/authorized_keys/#/var/lib/misc/userkeys/#g" /etc/ssh/sshd_config
+	sudo service ssh reload
+}
 
 sudo mkdir -p /srv/workspace
 [ -d /srv/schroots ] || sudo mkdir -p /srv/schroots

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git