From: Dan Brown <redacted>
Date: Sun, 21 Mar 2021 21:30:47 +0000 (+0000)
Subject: Updated 18.04 install script to use php7.4
X-Git-Url: http://source.bookstackapp.com/devops/commitdiff_plain/01c971cb1a670c69481003edc0add164cd32b344

Updated 18.04 install script to use php7.4

As per BookStackApp/BookStack/issues/2648
---

diff --git a/scripts/installation-ubuntu-18.04.sh b/scripts/installation-ubuntu-18.04.sh
index 6dbb4ea..3ac52f0 100644
--- a/scripts/installation-ubuntu-18.04.sh
+++ b/scripts/installation-ubuntu-18.04.sh
@@ -18,9 +18,9 @@ CURRENT_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -
 # Install core system packages
 export DEBIAN_FRONTEND=noninteractive
 add-apt-repository universe
-apt update
-apt install -y git apache2 php7.2 curl php7.2-fpm php7.2-curl php7.2-mbstring php7.2-ldap \
-php7.2-tidy php7.2-xml php7.2-zip php7.2-gd php7.2-mysql mysql-server-5.7 libapache2-mod-php7.2
+add-apt-repository -yu ppa:ondrej/php
+apt install -y git apache2 php7.4 curl php7.4-fpm php7.4-curl php7.4-mbstring php7.4-ldap \
+php7.4-xml php7.4-zip php7.4-gd php7.4-mysql mysql-server-5.7 libapache2-mod-php7.4
 
 # Set up database
 DB_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 13)"
@@ -71,7 +71,7 @@ chown www-data:www-data -R bootstrap/cache public/uploads storage && chmod -R 75
 
 # Set up apache
 a2enmod rewrite
-a2enmod php7.2
+a2enmod php7.4
 
 cat >/etc/apache2/sites-available/bookstack.conf <<EOL
 <VirtualHost *:80>