From 87af683c9bbb6834aaf66347702e48bd43f76e83 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Sun, 7 Mar 2021 19:08:04 +0100
Subject: [PATCH] docs: fix php7.4 imagick version (#4937)

---
 docs/installation/providers/ubuntu.md        |  2 +-
 scripts/vagrant/build/.travis.deploy.json.in | 33 --------------------
 scripts/vagrant/build/install-monica.sh      |  2 +-
 scripts/vagrant/install-vagrant.sh           |  2 +-
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 scripts/vagrant/build/.travis.deploy.json.in

diff --git a/docs/installation/providers/ubuntu.md b/docs/installation/providers/ubuntu.md
index 14b2730e6..f9d9ecc45 100644
--- a/docs/installation/providers/ubuntu.md
+++ b/docs/installation/providers/ubuntu.md
@@ -55,7 +55,7 @@ Then install php 7.4 with these extensions:
 sudo apt update
 sudo apt install -y php7.4 php7.4-cli php7.4-common php7.4-fpm \
     php7.4-json php7.4-opcache php7.4-mysql php7.4-mbstring php7.4-zip \
-    php7.4-bcmath php7.4-intl php7.4-xml php7.4-curl php7.4-gd php7.4-gmp php-imagick
+    php7.4-bcmath php7.4-intl php7.4-xml php7.4-curl php7.4-gd php7.4-gmp php7.4-imagick
 ```
 
 **Composer:** After you're done installing PHP, you'll need the [Composer](https://getcomposer.org/download/) dependency manager.
diff --git a/scripts/vagrant/build/.travis.deploy.json.in b/scripts/vagrant/build/.travis.deploy.json.in
deleted file mode 100644
index c1e46dc8f..000000000
--- a/scripts/vagrant/build/.travis.deploy.json.in
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "package": {
-        "name": "monicahq",
-        "repo": "vagrant",
-        "subject": "monicahq",
-        "desc": "MonicaHQ, the Personal Relationship Manager",
-        "website_url": "https://www.monicahq.com",
-        "issue_tracker_url": "https://github.com/monicahq/monica/issues",
-        "vcs_url": "https://github.com/monicahq/monica.git",
-        "github_use_tag_release_notes": true,
-        "github_release_notes_file": "CHANGELOG.md",
-        "licenses": ["AGPL-V3"],
-        "labels": [],
-        "public_download_numbers": false,
-        "public_stats": false,
-        "attributes": []
-    },
-    "version": {
-        "name": "$(version)",
-        "desc": "$(description)",
-        "released": "$(released)",
-        "vcs_tag": "$(travis_tag)",
-        "github_use_tag_release_notes": true,
-        "attributes": [
-            {"name": "commit", "values" : ["$(travis_commit)"], "type": "string"},
-            {"name": "build", "values" : [$(travis_build_number)]}
-        ]
-    },
-    "files": [
-        {"includePattern": "scripts/vagrant/build/monicahq-stable\.box", "uploadPattern": "monicahq.box"}
-    ],
-    "publish": true
-}
\ No newline at end of file
diff --git a/scripts/vagrant/build/install-monica.sh b/scripts/vagrant/build/install-monica.sh
index fea15fa65..a28b119ed 100644
--- a/scripts/vagrant/build/install-monica.sh
+++ b/scripts/vagrant/build/install-monica.sh
@@ -54,7 +54,7 @@ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin
 echo -e "\n\033[4;32mInstalling packages for Monica\033[0;40m"
 apt-get install -y php7.4-common php7.4-fpm \
     php7.4-json php7.4-opcache php7.4-mysql php7.4-mbstring php7.4-zip \
-    php7.4-bcmath php7.4-intl php7.4-xml php7.4-curl php7.4-gd php7.4-gmp >/dev/null
+    php7.4-bcmath php7.4-intl php7.4-xml php7.4-curl php7.4-gd php7.4-gmp php7.4-imagick >/dev/null
 
 echo -e "\n\033[4;32mGetting database ready\033[0;40m"
 mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "CREATE DATABASE $MYSQL_DB_DATABASE;
diff --git a/scripts/vagrant/install-vagrant.sh b/scripts/vagrant/install-vagrant.sh
index 715670d49..aef3634ea 100755
--- a/scripts/vagrant/install-vagrant.sh
+++ b/scripts/vagrant/install-vagrant.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # set version of vagrant to use :
-vagrantversion=2.2.4
+vagrantversion=2.2.14
 
 mkdir -p $HOME/vagrant
 pushd $HOME/vagrant > /dev/null