From: Dan Brown <redacted>
Date: Sat, 16 Jan 2021 15:56:42 +0000 (+0000)
Subject: Muted composer question, fixed apache log paths
X-Git-Url: http://source.bookstackapp.com/devops/commitdiff_plain/d72f29bb83773e0882781afa9f5d209be7c92beb

Muted composer question, fixed apache log paths

Composer warning was about running as root.
Muted the warning/prompt from showing, adding the --no-plugins flag for
a little extra safety.
AFAICT, the composer warning shows as since the top-level project's
(BookStack in this case) scripts will be ran as root in this case.
Since the user is already running the whole script as root they'd
already be putting trust in this install process so preventing running
scripts as the root user won't achieve a massive amount.
---

diff --git a/.gitignore b/.gitignore
index 94695ea..57c1ada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.vagrant/
\ No newline at end of file
+.vagrant/
+.idea/
\ No newline at end of file
diff --git a/scripts/installation-ubuntu-18.04.sh b/scripts/installation-ubuntu-18.04.sh
index 4038d49..6dbb4ea 100644
--- a/scripts/installation-ubuntu-18.04.sh
+++ b/scripts/installation-ubuntu-18.04.sh
@@ -51,7 +51,8 @@ else
 fi
 
 # Install BookStack composer dependencies
-php composer.phar install --no-dev
+export COMPOSER_ALLOW_SUPERUSER=1
+php composer.phar install --no-dev --no-plugins
 
 # Copy and update BookStack environment variables
 cp .env.example .env
@@ -106,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
diff --git a/scripts/installation-ubuntu-20.04.sh b/scripts/installation-ubuntu-20.04.sh
index 7e79ea0..754103e 100644
--- a/scripts/installation-ubuntu-20.04.sh
+++ b/scripts/installation-ubuntu-20.04.sh
@@ -51,7 +51,8 @@ else
 fi
 
 # Install BookStack composer dependencies
-php composer.phar install --no-dev
+export COMPOSER_ALLOW_SUPERUSER=1
+php composer.phar install --no-dev --no-plugins
 
 # Copy and update BookStack environment variables
 cp .env.example .env
@@ -106,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