From 78a62ed8601617d636a2c0c0390500fbbf362faa Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <andrew@engelbrecht.io>
Date: Dec 14 2020 00:00:18 +0000
Subject: [PATCH 1/2] Fix SSH for Vagrant when personal keys installed


Without the option in this commit, 'vagrant up' will attempt to connect
using one's personal SSH keys. This becomes a problem when those keys
are installed into Gitolite for pushing to repositories. This causes
normal SSH logins to fail, so Vagrant can't mount the synced folder via
sshfs.

---

diff --git a/dev/Vagrantfile.example b/dev/Vagrantfile.example
index 0ba75d4..b38dce7 100644
--- a/dev/Vagrantfile.example
+++ b/dev/Vagrantfile.example
@@ -27,6 +27,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  # config.vm.synced_folder ".", "/vagrant", type: "nfs", nfs_version: 4, nfs_udp: false
  config.vm.synced_folder ".", "/vagrant", disabled: true
  config.vm.synced_folder ".", "/srv/pagure",
+     ssh_opts_append: "-o IdentitiesOnly=yes",
      type: "sshfs"
 
  # To cache update packages (which is helpful if frequently doing `vagrant destroy && vagrant up`)

From f5abfeccdbaee7da621a5b91b64bd412af93cbfd Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <andrew@sol.lan>
Date: Dec 14 2020 01:42:56 +0000
Subject: [PATCH 2/2] Correct link to Fedora 30 Vagrant image


---

diff --git a/dev/Vagrantfile.example b/dev/Vagrantfile.example
index b38dce7..ce7254a 100644
--- a/dev/Vagrantfile.example
+++ b/dev/Vagrantfile.example
@@ -4,7 +4,7 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1.2.x86_64.vagrant-libvirt.box"
+ config.vm.box_url = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1.2.x86_64.vagrant-libvirt.box"
  config.vm.box = "f30-cloud-libvirt"