X-Git-Url: http://source.bookstackapp.com/devops/blobdiff_plain/59b5f6ebb2bd840a1c545ab52312b70aae3b7389..01c971cb1a670c69481003edc0add164cd32b344:/scripts/installation-ubuntu-18.04.sh

diff --git a/scripts/installation-ubuntu-18.04.sh b/scripts/installation-ubuntu-18.04.sh
index 678cee1..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)"
@@ -50,15 +50,17 @@ else
     exit 1
 fi
 
-# Install BookStack composer dependancies
-php composer.phar install --no-dev
+# Install BookStack composer dependencies
+export COMPOSER_ALLOW_SUPERUSER=1
+php composer.phar install --no-dev --no-plugins
 
 # Copy and update BookStack environment variables
 cp .env.example .env
+sed -i.bak "s@APP_URL=.*\$@APP_URL=http://$DOMAIN@" .env
 sed -i.bak 's/DB_DATABASE=.*$/DB_DATABASE=bookstack/' .env
 sed -i.bak 's/DB_USERNAME=.*$/DB_USERNAME=bookstack/' .env
 sed -i.bak "s/DB_PASSWORD=.*\$/DB_PASSWORD=$DB_PASS/" .env
-echo "APP_URL="
+
 # Generate the application key
 php artisan key:generate --no-interaction --force
 # Migrate the databases
@@ -69,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>
@@ -105,8 +107,8 @@ cat >/etc/apache2/sites-available/bookstack.conf <<EOL
         </IfModule>
     </Directory>
 
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
+	ErrorLog \${APACHE_LOG_DIR}/error.log
+	CustomLog \${APACHE_LOG_DIR}/access.log combined
 
 </VirtualHost>
 EOL