mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildserver: let vagrant package handle insecure private key

Browse source 
This script was overwriting the provisioning that `vagrant package` does
already, and breaking `vagrant ssh`.  It should have been removed in !1099

closes #990
    fdroid-bootstrap-buildserver#12
    !1012
    !1099
c6f5956537
This commit is contained in:
Hans-Christoph Steiner 2022-10-19 09:50:01 +02:00
parent 1e2e82fbde
commit 1dd480405e
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/Vagrantfile vendored
View file

@ -83,8 +83,6 @@ Vagrant.configure("2") do |config|
owner: 'root', group: 'root', create: true owner: 'root', group: 'root', create: true
end end
config.vm.provision "shell", name: "vagrant-insecure-private-key",
path: "provision-vagrant-insecure-private-key"
config.vm.provision "shell", name: "setup-env-vars", path: "setup-env-vars", config.vm.provision "shell", name: "setup-env-vars", path: "setup-env-vars",
args: ["/opt/android-sdk"] args: ["/opt/android-sdk"]
config.vm.provision "shell", name: "apt-get-install", path: "provision-apt-get-install", config.vm.provision "shell", name: "apt-get-install", path: "provision-apt-get-install",

17
buildserver/provision-vagrant-insecure-private-key
View file

@ -1,17 +0,0 @@
#!/bin/bash -e
#
# Vagrant uses the "insecure private key" to establish the first SSH
# connection to a new VM based on a clean public box. In theory, the
# `vagrant package` command should do that automatically. This
# process is still using custom code instead of `vagrant package`,
# hence this script.
#
# https://gitlab.com/fdroid/fdroid-bootstrap-buildserver/-/issues/12
# https://www.vagrantup.com/docs/vagrantfile/ssh_settings#config-ssh-private_key_path
#
# This public key can be generated using:
# ssh-keygen -y -f ~/.vagrant.d/insecure_private_key
echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== ~/.vagrant.d/insecure_private_key" > /home/vagrant/.ssh/authorized_keys
chown vagrant:vagrant /home/vagrant/.ssh/authorized_keys
chmod 600 /home/vagrant/.ssh/authorized_keys