Update Vagrant box to buster (parity with production) (#99)

Author: zerolab

Vagrantfile

@@ -1,99 +1,37 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "torchbox/wagtail-stretch64"
-  config.vm.box_version = "~> 1.0"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Workaround to prevent missing linux headers making new installs fail.
-  # Adapted from https://github.com/dotless-de/vagrant-vbguest/issues/351#issuecomment-536282015
-  if Vagrant.has_plugin?("vagrant-vbguest")
-    class WorkaroundVbguest < VagrantVbguest::Installers::Linux
-        def install(opts=nil, &block)
-              puts 'Ensuring we\'ve got the correct build environment for vbguest...'
-              communicate.sudo('apt-get -y --force-yes update', (opts || {}).merge(:error_check => false), &block)
-              communicate.sudo('apt-get -y --force-yes install -y build-essential linux-headers-amd64 linux-image-amd64', (opts || {}).merge(:error_check => false), &block)
-              puts 'Continuing with vbguest installation...'
-            super
-              puts 'Performing vbguest post-installation steps...'
-                communicate.sudo('usermod -a -G vboxsf vagrant', (opts || {}).merge(:error_check => false), &block)
-        end
-        def reboot_after_install?(opts=nil, &block)
-          true
-        end
-      end
 
-
-    config.vbguest.installer = WorkaroundVbguest
+Vagrant.configure(2) do |config|
+  config.vm.box = "wagtail/buster64"
+  config.vm.box_version = "~> 1.1.0"
+
+  # If a 'Vagrantfile.local' file exists, import any configuration settings
+  # defined there into here. Vagrantfile.local is ignored in version control,
+  # so this can be used to add configuration specific to this computer.
+  # `git rev-parse` just helps find it if `vagrant up` is not run from the project root.
+  vagrantfile_local = `git rev-parse --show-toplevel`.split("\n")[0] + "/Vagrantfile.local"
+  if File.exist? "Vagrantfile.local"
+    instance_eval File.read("Vagrantfile.local"), "Vagrantfile.local"
   end
-  # End workaround
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8000" will access port 8000 on the guest machine.
-  config.vm.network "forwarded_port", guest: 8000, host: 8000, auto_correct: true
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
 
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
+  config.vm.network "forwarded_port", guest: 8000, host: @FORWARD_PORT || 8000, auto_correct: true
+  config.vm.provision :shell, :path => "vagrant/provision.sh", :args => "wagtailio"
+  config.ssh.forward_agent = true
 
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
+  config.vm.provider "virtualbox" do |vb|
+    # increase memory by default; can be changed in Vagrantfile_local.rb
+    vb.memory = @MEMORY_MB || 2048
+  end
 
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
-  config.vm.provision :shell, :path => "vagrant/provision.sh", :args => "wagtailio"
+  # https://www.vagrantup.com/docs/synced-folders/nfs.html
+  if @NFS
+      puts "NFS=#{@NFS}"
+      config.vm.synced_folder ".", "/vagrant", :nfs => @NFS, :mount_options => ['actimeo=2']
+      config.vm.network :private_network, type: "dhcp"
+  end
 
-  # Enable agent forwarding over SSH connections.
-  config.ssh.forward_agent = true
+  if Vagrant.has_plugin?("vagrant-vbguest")
+    config.vbguest.auto_update = false
+  end
 end

Vagrantfile.local.example

@@ -0,0 +1,6 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+@FORWARD_PORT = 8001
+@NFS = False
+@MEMORY_MB = 2048

vagrant/provision.sh

@@ -11,10 +11,6 @@ PIP=$VIRTUALENV_DIR/bin/pip
 apt-get update -y
 apt-get install -y unzip
 
-# Upgrade PostgreSQL to match version on Heroku
-service postgresql stop
-apt-get remove -y --purge postgresql-*
-apt-get install -y postgresql-11 postgresql-client-10 postgresql-contrib-10 postgresql-10-postgis-2.5
 su - postgres -c "createuser -s vagrant"
 
 # Create database