From 4a85250242569ecddd31b0647798f96290d77f6d Mon Sep 17 00:00:00 2001 From: David Duque Date: Wed, 8 Jul 2020 19:31:35 +0100 Subject: [PATCH 01/12] Revert vagrantfile to upstream config --- Vagrantfile | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 2d6d3a0d..9e7ac462 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,12 +1,11 @@ + # -*- mode: ruby -*- # vi: set ft=ruby : Vagrant.configure("2") do |config| - # Recreate our conditions - config.vm.box = "generic/debian10" - config.vm.provider "hyperv" do |v| - v.memory = 1024 - v.cpus = 1 + config.vm.box = "debian/buster64" + config.vm.provider :virtualbox do |vb| + vb.customize ["modifyvm", :id, "--cpus", 1, "--memory", 1024] end # Network config: Since it's a mail server, the machine must be connected @@ -24,24 +23,9 @@ Vagrant.configure("2") do |config| export PUBLIC_IP=auto export PUBLIC_IPV6=auto export PRIMARY_HOSTNAME=auto - #export SKIP_NETWORK_CHECKS=1 - - if [ ! git ] - then - apt update - apt install git - fi - - if [ ! -d /mailinabox ]; - then - git clone https://github.com/ddavness/power-mailinabox.git /mailinabox - fi - + export SKIP_NETWORK_CHECKS=1 # Start the setup script. - cd /mailinabox - git checkout development - git pull - + cd /vagrant setup/start.sh SH -end +end \ No newline at end of file From 199c2c50babd0b0822a86bee6f2ad06020fe185f Mon Sep 17 00:00:00 2001 From: David Duque Date: Wed, 8 Jul 2020 19:32:24 +0100 Subject: [PATCH 02/12] Backups: Fix backup target selector width --- management/templates/system-backup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/templates/system-backup.html b/management/templates/system-backup.html index 3860edb7..81915fdc 100644 --- a/management/templates/system-backup.html +++ b/management/templates/system-backup.html @@ -12,7 +12,7 @@
-
+