diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index a24d348e5..8a977fffe 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -364,7 +364,11 @@ fi uptime=$(uptime --pretty) datetime=$(date) -# write results to a json file on RAM disk cache +# if running as user "pi": +# - write results to a JSON file on RAM disk +# - update info.html file +if [ "${EUID}" == "$(id -u pi)" ]; then + cat < /var/cache/raspiblitz/info.json { "uptime": "${uptime}", @@ -396,7 +400,9 @@ cat < /var/cache/raspiblitz/info.json } EOF -# update info.html file -/usr/local/bin/j2 /var/www/blitzweb/info/info.j2 /var/cache/raspiblitz/info.json -o /var/cache/raspiblitz/info.html + # use Jinja2 and apply json data to template to procude static html file + /usr/local/bin/j2 /var/www/blitzweb/info/info.j2 /var/cache/raspiblitz/info.json -o /var/cache/raspiblitz/info.html +fi + # EOF diff --git a/home.admin/assets/blitzweb.conf b/home.admin/assets/blitzweb.conf index d3635ecc5..6af949853 100644 --- a/home.admin/assets/blitzweb.conf +++ b/home.admin/assets/blitzweb.conf @@ -27,4 +27,15 @@ A+SHA384:EDH+aRSA+AESGCM:EDH+aRSA+SHA256:EDH+aRSA:EECDH:!aNULL:!eNULL:!MEDIUM:!L root /var/www/blitzweb; + location / { + # First attempt to serve request as file, then + # as directory, then fall back to displaying a 404. + try_files $uri $uri/ =404; + } + + location /info/ { + auth_basic "BlitzWeb Admin"; + auth_basic_user_file /etc/nginx/.htpasswd; + } + }