include changes from v0.53. Remove some POWER modifications to closer follow original mialinabox

Vagrantfile

@@ -1,20 +1,8 @@
- 
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/buster64"
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ["modifyvm", :id, "--cpus", 4, "--memory", 4096]
-  end
-  config.vm.provider :libvirt do |v|
-    v.memory = 4096
-    v.cpus = 4
-    v.nested = true
-  end
-  config.vm.provider :kvm do |kvm|
-    kvm.memory_size = '4096m'
-  end
+  config.vm.box = "ubuntu/bionic64"
 
   # Network config: Since it's a mail server, the machine must be connected
   # to the public web. However, we currently don't want to expose SSH since
@@ -22,20 +10,19 @@ Vagrant.configure("2") do |config|
   # machine on a private network.
   config.vm.hostname = "mailinabox.lan"
   config.vm.network "private_network", ip: "192.168.50.4"
-  config.vm.synced_folder ".", "/vagrant", nfs_version: "3"
-  #, :mount_options => ["ro"]
 
   config.vm.provision :shell, :inline => <<-SH
     # Set environment variables so that the setup script does
     # not ask any questions during provisioning. We'll let the
     # machine figure out its own public IP.
     export NONINTERACTIVE=1
-    export PUBLIC_IP=192.168.50.4
+    export PUBLIC_IP=auto
     export PUBLIC_IPV6=auto
     export PRIMARY_HOSTNAME=auto
-    export SKIP_NETWORK_CHECKS=1
+    #export SKIP_NETWORK_CHECKS=1
+
     # Start the setup script.
     cd /vagrant
     setup/start.sh
 SH
-end
+end