From e3fbff97b18f8aefb7f62e8680168ccba11f0683 Mon Sep 17 00:00:00 2001
From: Ed Chalstrey <edwardchalstrey@gmail.com>
Date: Mon, 14 Feb 2022 09:58:50 +0000
Subject: [PATCH] revert Vagrant changes, added to separate branch fix-vagrant

---
 Vagrantfile               | 8 ++++----
 provision/vm_provision.sh | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e12b487d..181e3aec 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://vagrantcloud.com/search.
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "bento/ubuntu-18.04"
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine and only allow access
@@ -30,10 +30,10 @@ Vagrant.configure("2") do |config|
   # Using VirtualBox:
   config.vm.provider :virtualbox do |vm|
     # # Display the VirtualBox GUI when booting the machine
-    # vm.gui = true
+    # vb.gui = true
 
     # # Customize the amount of memory on the VM:
-    vm.memory = "2048" # default, 1024 was not enough
+    # vb.memory = "1024"
 
     # Enable creating symlinks in shared folder
     # On a Windows host, vagrant will need to run with permissions to 'Create Symlinks', either
@@ -46,4 +46,4 @@ Vagrant.configure("2") do |config|
   # 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", path: "provision/vm_provision.sh"
-end
\ No newline at end of file
+end
diff --git a/provision/vm_provision.sh b/provision/vm_provision.sh
index 5847e735..88f08d70 100644
--- a/provision/vm_provision.sh
+++ b/provision/vm_provision.sh
@@ -17,11 +17,6 @@ set -x
 # Create vagrant user if not exists
 id -u vagrant >/dev/null 2>&1 || useradd --create-home vagrant
 
-# Create the file repository configuration:
-sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-
-# Import the repository signing key:
-wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 
 #
 # Install OS packages
@@ -45,7 +40,7 @@ apt-get install -y \
 #
 
 # node version and platform
-NODE_VERSION=v16.13.2
+NODE_VERSION=v12.18.1
 DISTRO=linux-x64
 
 # download
@@ -123,7 +118,7 @@ chown -R vagrant:vagrant /home/vagrant/colouringlondon
 #
 
 # Install latest release of npm
-npm install -g npm@latest
+npm install -g npm@next
 
 # Local fixed install of node modules
 cd /vagrant/app && npm install