Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package kiwi-images-vagrant for 
openSUSE:Factory checked in at 2021-08-26 23:14:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-images-vagrant (Old)
 and      /work/SRC/openSUSE:Factory/.kiwi-images-vagrant.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kiwi-images-vagrant"

Thu Aug 26 23:14:20 2021 rev:9 rq:913996 version:1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi-images-vagrant/Tumbleweed.changes   
2021-07-07 18:30:22.427040808 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi-images-vagrant.new.1899/Tumbleweed.changes 
2021-08-26 23:14:32.776261168 +0200
@@ -1,0 +2,5 @@
+Tue Aug 24 11:48:21 UTC 2021 - Dan ??erm??k <dcer...@suse.com>
+
+- Fix modification of the sshd config when /usr/etc/ is used
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.PVzdSm/_old  2021-08-26 23:14:33.352260928 +0200
+++ /var/tmp/diff_new_pack.PVzdSm/_new  2021-08-26 23:14:33.356260925 +0200
@@ -94,13 +94,20 @@
     # insert the default insecure ssh key from here:
     # https://github.com/hashicorp/vagrant/blob/master/keys/vagrant.pub
     mkdir -p /home/vagrant/.ssh/
+    chmod 0700 /home/vagrant/.ssh/
     echo "ssh-rsa 
AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
 vagrant insecure public key" > /home/vagrant/.ssh/authorized_keys
     chmod 0600 /home/vagrant/.ssh/authorized_keys
     chown -R vagrant:vagrant /home/vagrant/
 
-    # recommended ssh settings for vagrant boxes
-    echo "UseDNS no" >> /etc/ssh/sshd_config
-    echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config
+    # apply recommended ssh settings for vagrant boxes
+    SSHD_CONFIG=/etc/ssh/sshd_config.d/99-vagrant.conf
+    if [[ ! -d "$(dirname ${SSHD_CONFIG})" ]]; then
+        SSHD_CONFIG=/etc/ssh/sshd_config
+        # prepend the settings, so that they take precedence
+        echo -e "UseDNS no\nGSSAPIAuthentication no\n$(cat ${SSHD_CONFIG})" > 
${SSHD_CONFIG}
+    else
+        echo -e "UseDNS no\nGSSAPIAuthentication no" > ${SSHD_CONFIG}
+    fi
 
     # vagrant assumes that it can sudo without a password
     # => add the vagrant user to the sudoers list

Reply via email to