From c589d991c3425b789505bf4ed29dff66c5a88102 Mon Sep 17 00:00:00 2001
From: Manabu Niseki <manabu.niseki@gmail.com>
Date: Sun, 4 Aug 2019 15:08:45 +0900
Subject: [PATCH 1/2] Update Vagrantfile

Update to use Ubuntu 18.04
---
 Vagrantfile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7cb56d2..84bda7b 100755
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,9 +12,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  #config.vm.box = "ubuntu/artful64"
-  config.vm.box = "fso/artful64"
-  config.vm.provision :shell, path: "bootstrap.sh", args: "#{MISP_ENV}"
+  # config.vm.box = "ubuntu/artful64"
+  config.vm.box = "ubuntu/bionic64"
+  config.vm.provision :shell, path: "bootstrap.sh", args: MISP_ENV.to_s
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -45,23 +45,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
   disabled = true
-  vm_name = "MISP - Ubuntu 17.10"
-  if "#{MISP_ENV}" == "dev"
-      disabled = false
-      vm_name.concat(" - DEV")
+  vm_name = "MISP - Ubuntu 18.04"
+  if MISP_ENV.to_s == "dev"
+    disabled = false
+    vm_name.concat(" - DEV")
   end
   config.vm.synced_folder "..", "/var/www/MISP",
-                        owner: "www-data", group: "www-data", disabled: disabled
+                          owner: "www-data", group: "www-data", disabled: disabled
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:
   #
   config.vm.provider "virtualbox" do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
+    #   # Don't boot with headless mode
+    #   vb.gui = true
+    #
+    #   # Use VBoxManage to customize the VM. For example to change memory:
     vb.customize ["modifyvm", :id, "--memory", "2048"]
     vb.customize ["modifyvm", :id, "--name", vm_name]
   end

From 3f9cef4be4f2f3c14e89a020a8f0042c8c05bb29 Mon Sep 17 00:00:00 2001
From: Manabu Niseki <manabu.niseki@gmail.com>
Date: Sun, 4 Aug 2019 15:09:07 +0900
Subject: [PATCH 2/2] Update bootstrap.sh

---
 bootstrap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 416448b..e94ec61 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -42,8 +42,7 @@ post_max_size=50M
 max_execution_time=300
 max_input_time=223
 memory_limit=512M
-PHP_INI=/etc/php/7.1/apache2/php.ini
-
+PHP_INI=/etc/php/7.2/apache2/php.ini
 
 export DEBIAN_FRONTEND=noninteractive
 export LANGUAGE=en_US.UTF-8
@@ -112,7 +111,8 @@ a2ensite default-ssl > /dev/null
 
 
 echo "--- Installing PHP-specific packages… ---"
-apt-get install -y libapache2-mod-php php php-cli php-crypt-gpg php-dev php-json php-mysql php-opcache php-readline php-redis php-xml > /dev/null
+apt-get install -y libapache2-mod-php php php-cli php-gnupg php-dev php-json php-mysql php-opcache php-readline php-redis php-xml php-mbstring php-gd > /dev/null
+
 
 
 echo -e "\n--- Configuring PHP (sane PHP defaults)… ---\n"