From 3e98656ba03efacb45db7e9d679455df33cdc50c Mon Sep 17 00:00:00 2001
From: meaz <meaz@disroot.org>
Date: Sat, 28 Dec 2019 09:12:23 +0100
Subject: [PATCH] Update to php7.4 and composer 1.9.1, fix some typos

---
 vagrant/bootstrap.sh                          | 21 ++++++++++++-------
 .../nginx/sites-available/disroot.lan.conf    |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 5c562c18..5998f77b 100755
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -7,21 +7,26 @@ WWW_USER="www-data"
 
 # Provisioning actions
 
-# Add sury repository to sources.list for PHP7.1
+# Add sury repository to sources.list for PHP7.4
 sudo apt-get -y update
 sudo apt-get -y upgrade
 sudo apt-get -y install ca-certificates apt-transport-https
 echo "deb https://packages.sury.org/php/ stretch main" | sudo tee -a /etc/apt/sources.list.d/php.list
-# Sury Key for PHP7.1
+
+# Sury Key for PHP7.4
 wget -q https://packages.sury.org/php/apt.gpg -O- | sudo apt-key add -
 sudo apt-get -y update
 
-echo "Installing nginx.."
-sudo apt-get install -y nginx-full composer
-echo "Installing php7.."
-sudo apt-get install -y php7.3-zip php7.3-cli php7.3-curl php7.3-gd php7.3-mbstring php7.3-xml php7.3-fpm
+echo "Installing nginx..."
+sudo apt-get install -y nginx-full
 
-# Create the Apache config files and restart webserver
+echo "Installing composer..."
+sudo apt-get install -y composer
+
+echo "Installing php7..."
+sudo apt-get install -y php7.4-zip php7.4-cli php7.4-curl php7.4-gd php7.4-mbstring php7.4-xml php7.4-fpm
+
+# Create the Nginx config files and restart webserver
 sudo rsync -cr /vagrant/provision/etc/nginx/sites-available /etc/nginx/
 sudo ln -s /etc/nginx/sites-available/"${WEB_NAME}".conf /etc/nginx/sites-enabled/"${WEB_NAME}".conf
 sudo rm /etc/nginx/sites-enabled/default
@@ -29,7 +34,7 @@ sudo service nginx restart
 
 # Install GRAV in webroot
 sudo chown -R ${WWW_USER}:${WWW_USER} /var/www
-sudo wget https://getcomposer.org/download/1.8.0/composer.phar -O /usr/local/bin/composer && sudo chmod 755 /usr/local/bin/composer
+sudo wget https://getcomposer.org/download/1.9.1/composer.phar -O /usr/local/bin/composer && sudo chmod 755 /usr/local/bin/composer
 echo "Git"
 git clone -b master https://github.com/getgrav/grav.git "${WEB_ROOT}""${WEB_NAME}"
 sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
diff --git a/vagrant/provision/etc/nginx/sites-available/disroot.lan.conf b/vagrant/provision/etc/nginx/sites-available/disroot.lan.conf
index 46bf4b85..ff7eaffc 100644
--- a/vagrant/provision/etc/nginx/sites-available/disroot.lan.conf
+++ b/vagrant/provision/etc/nginx/sites-available/disroot.lan.conf
@@ -29,7 +29,7 @@ server {
   location ~ /(LICENSE.txt|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess) { return 403; }
 
   location ~ \.php$ {
-    fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
+    fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
     fastcgi_split_path_info ^(.+\.php)(/.+)$;
     fastcgi_index index.php;
     include fastcgi_params;