use optional volume mount instead of env

This commit is contained in:
Alex Phillips 2022-02-03 09:38:52 -05:00
parent 52aaaa7741
commit 52b59d4dce
2 changed files with 2 additions and 6 deletions

View File

@ -252,8 +252,8 @@
$geodb = '';
endif;
$access_log = getenv("GOACCESS_LOG_FILE") ?: "/config/log/nginx/access.log";
$goaccess = shell_exec("/usr/local/bin/goaccess -a -o html -f $access_log --config-file=/dashboard/goaccess.conf ".$geodb);
$access_log = file_exists("/dashboard/logs") ? "/dashboard/logs/*" : "/config/log/nginx/access.log";
$goaccess = shell_exec("cat $access_log" | /usr/local/bin/goaccess -a -o html --config-file=/dashboard/goaccess.conf $geodb -");
$goaccess = str_replace("<title>Server&nbsp;Statistics", "<title>SWAG&nbsp;Dashboard", $goaccess);
$goaccess = str_replace("<h1 class='h-dashboard'>", "<h1>", $goaccess);
$goaccess = str_replace("<i class='fa fa-tachometer'></i>", "<img src='/icon.svg' width='32' height='32'>&nbsp;SWAG&nbsp;", $goaccess);

View File

@ -22,10 +22,6 @@ if [ "$(sed -nE 's|## Version ([0-9]{4}\/[0-9]{2}\/[0-9]{2}).*|\1|p' /dashboard/
echo "**** Compare the changes using the sample file: /config/nginx/proxy-confs/dashboard.subdomain.conf.sample"
fi
# preserve environment variables in PHP
sed -E -i 's/^clear_env =.*$/clear_env = no/g' /config/php/www2.conf
grep -qxF 'clear_env = no' /config/php/www2.conf || echo 'clear_env = no' >> /config/php/www2.conf
# permissions
chown -R abc:abc \
/dashboard \