From 046d3c8dcf5a0f58cf3eec9cbc3ff489863753ed Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 30 Oct 2021 20:58:42 +0200
Subject: [PATCH] Use ssh_config.d

---
 buildserver/setup-env-vars | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildserver/setup-env-vars b/buildserver/setup-env-vars
index a5f53fd8..d7d8d245 100644
--- a/buildserver/setup-env-vars
+++ b/buildserver/setup-env-vars
@@ -18,5 +18,9 @@ echo 'export fdroidserver=$home_vagrant/fdroidserver' >> $bsenv
 chmod 0644 $bsenv
 
 # make sure that SSH never hangs at a password or key prompt
-printf '    StrictHostKeyChecking yes\n' >> /etc/ssh/ssh_config
-printf '    BatchMode yes\n' >> /etc/ssh/ssh_config
+mkdir -p /etc/ssh/ssh_config.d/
+cat << EOF >> /etc/ssh/ssh_config.d/fdroid
+Host *
+    StrictHostKeyChecking yes
+    BatchMode yes
+EOF