Drop Vagrant development boxes

We now recommend using Docker for development instead.
mysociety · Oct 17, 2023 · 3b898b6 · 3b898b6
1 parent e99f6c8
commit 3b898b6
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 296 deletions.
diff --git a/.vagrant.yml.example b/.vagrant.yml.example
diff --git a/Vagrantfile b/Vagrantfile
diff --git a/bin/vagrant-bullseye b/bin/vagrant-bullseye
diff --git a/bin/vagrant-focal b/bin/vagrant-focal
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -1,3 +1,15 @@
+# develop
+
+## Highlighted Features
+
+* Remove Vagrant development boxes (Graeme Porteous)
+
+## Upgrade Notes
+
+* _Note:_ If you were using Vagrant development boxes these are now unsupported.
+  Please switch to using Docker. See:
+  https://alaveteli.org/docs/installing/docker/
+
 # 0.43.2.0
 
 ## Highlighted Features

diff --git a/script/defer b/script/defer
@@ -8,8 +8,8 @@
 # In /var/www/alaveteli/config/aliases, swap the filter to mailin to send to
 # the defer script.
 #
-#   # ^foi\\+.*: "|/home/vagrant/alaveteli/script/mailin"
-#   ^foi\\+.*: "|/home/vagrant/alaveteli/script/defer"
+#   # ^foi\\+.*: "|/home/alaveteli/script/mailin"
+#   ^foi\\+.*: "|/home/alaveteli/script/defer"
 #
 # If you have Alaveteli set up to filter messages to site admin addresses,
 # redirect that to the defer script too.

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
@@ -302,20 +302,6 @@ if [ "$DEVELOPMENT_INSTALL" = true ]; then
   gem install mailcatcher
 fi
 
-if [ "$DEVELOPMENT_INSTALL" = true ] && [ x"$SUDO_USER" = x"vagrant" ]
-then
-  VAGRANT_DEV_INSTALL=true
-fi
-
-if [ "$VAGRANT_DEV_INSTALL" = true ] && [ ! -e "$REPOSITORY/config/xapian.yml" ]
-  then
-    cat > "$REPOSITORY/config/xapian.yml" <<EOF
-# Create test xapian DBs outside of the VirtualBox share to avoid corruption
-test:
-  base_db_path: "/tmp/xapiandbs"
-EOF
-fi
-
 # Set up root's crontab:
 echo -n "Creating /etc/cron.d/alaveteli... "
 (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_crontab DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' RUBY_VERSION='$RUBY_VERSION' USE_RBENV=$USE_RBENV RAILS_ENV='$RAILS_ENV' CRONTAB=config/crontab-example" "$UNIX_USER") > /etc/cron.d/alaveteli

diff --git a/script/test-vagrant-provisioning b/script/test-vagrant-provisioning
diff --git a/spec/models/mail_server_log/postfix_line_spec.rb b/spec/models/mail_server_log/postfix_line_spec.rb
@@ -13,7 +13,7 @@
   describe '#to_s' do
 
     it 'returns the log line' do
-      line = 'Oct  2 08:57:45 vagrant-ubuntu-precise-64 postfix/pickup[7843]: E9B4F420D5: uid=1001 from=<foi+request-117-c99ae4f3@localhost>'
+      line = 'Oct  2 08:57:45 ubuntu-precise-64 postfix/pickup[7843]: E9B4F420D5: uid=1001 from=<foi+request-117-c99ae4f3@localhost>'
       expect(described_class.new(line).to_s).to eq(line)
     end