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 94695ea06bf0cf255796f9f8a556888b2d3c1b8a..57c1adaae457e6feb6e172c697bddbf01f1b4245 100644 (file)
--- 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 4038d49bc0ee1ef48daf7c6754df27e263a61a06..6dbb4ea80b97e5c84caf7f6258c8fdfd0e25fbac 100644 (file)
--- 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 7e79ea0ec954704a233c1bb28ea6227c6f896185..754103ea6dd2045e0551c85bfa5b108f695a2303 100644 (file)
--- 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