From 72eeac2b2e5564222f88819b274245708607e923 Mon Sep 17 00:00:00 2001
From: Juha Jantunen <juha@strobotti.com>
Date: Fri, 3 Mar 2017 08:49:16 +0200
Subject: [PATCH] Fix vagrant provisioning

---
 Vagrantfile            |  6 +++---
 scripts/environment.sh | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 78d30a9..bc5bd24 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -36,7 +36,7 @@ mongo_enable_remote   = "false"  # remote access enabled when true
 
 # Languages and Packages
 php_timezone          = "UTC"    # http://php.net/manual/en/timezones.php
-php_version           = "5.6"    # Options: 5.5 | 5.6
+php_version           = "7.1"    # Options: 5.6 | 7.0 | 7.1
 ruby_version          = "latest" # Choose what ruby version should be installed (will also be the default version)
 ruby_gems             = [        # List any Ruby Gems that you want to install
   #"jekyll",
@@ -175,7 +175,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", path: "#{github_url}/scripts/base_box_optimizations.sh", privileged: true
 
   # Provision PHP
-  config.vm.provision "shell", path: "#{github_url}/scripts/php.sh", args: [php_timezone, hhvm, php_version]
+  config.vm.provision 'shell', inline: "sudo add-apt-repository -y ppa:ondrej/php && sudo apt-get update && sudo apt-get -y install php#{php_version}-fpm php#{php_version}-curl php#{php_version}-mbstring php#{php_version}-xml php#{php_version}-mysql php#{php_version}-gd", run: "once"
 
   # Enable MSSQL for PHP
   # config.vm.provision "shell", path: "#{github_url}/scripts/mssql.sh"
@@ -317,6 +317,6 @@ Vagrant.configure("2") do |config|
   # Any local scripts you may want to run post-provisioning.
   # Add these to the same directory as the Vagrantfile.
   ##########
-  config.vm.provision "shell", path: "./scripts/environment.sh", privileged: false
+  config.vm.provision "shell", inline: "/bin/bash /vagrant/scripts/environment.sh --php-version #{php_version}", run: "once"
 
 end
diff --git a/scripts/environment.sh b/scripts/environment.sh
index 49e0cb6..8b041ca 100644
--- a/scripts/environment.sh
+++ b/scripts/environment.sh
@@ -1,5 +1,23 @@
 #! /bin/bash
 
+# Defaults:
+PHP_VERSION=5.6
+
+while [[ $# -gt 1 ]]; do
+key="$1"
+
+case "$key" in
+    --php-version)
+    PHP_VERSION="$2"
+    shift # past argument
+    ;;
+    *)
+            # unknown option
+    ;;
+esac
+shift # past argument or value
+done
+
 block="
     server {
         listen 80;
@@ -36,8 +54,8 @@ block="
         location ~ \.php$ {
             try_files \$uri =404;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            # With php5-fpm:
-            fastcgi_pass 127.0.0.1:9000;
+            # With php-fpm:
+            fastcgi_pass unix:/run/php/php${PHP_VERSION}-fpm.sock;
             fastcgi_index index.php;
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;