summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-17 13:05:29 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-17 13:05:29 +0200
commitb6e388324943e0c545c1f9d994b5b52375677d7d (patch)
treefcf69b389d436b0e5c9a4aa2b6c5ff9f83076a7c
parentb3999887aa7387e7db24ebab04d3d15c4ac7d9df (diff)
downloadjenkins.debian.net-b6e388324943e0c545c1f9d994b5b52375677d7d.tar.xz
update_jdn: configure sshd as we want it
-rwxr-xr-xupdate_jdn.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 8c10e747..3b6126f7 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