From d16d45e04b446aa4c693bddd32c16bba7cf1a102 Mon Sep 17 00:00:00 2001 From: frennkie Date: Mon, 18 May 2020 20:07:22 +0100 Subject: [PATCH] change dir layout --- home.admin/00infoBlitz.sh | 2 +- home.admin/assets/www_blitzweb/index.html | 21 +++++++++++++++++++ .../assets/www_blitzweb/info/index.html | 1 + .../assets/www_blitzweb/{ => info}/info.j2 | 2 +- .../www_blitzweb/{css => info}/status.css | 0 home.admin/config.scripts/blitz.web.sh | 17 ++++++++++++--- 6 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 home.admin/assets/www_blitzweb/index.html create mode 120000 home.admin/assets/www_blitzweb/info/index.html rename home.admin/assets/www_blitzweb/{ => info}/info.j2 (99%) rename home.admin/assets/www_blitzweb/{css => info}/status.css (100%) diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index 46b1391ac..a24d348e5 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -397,6 +397,6 @@ cat < /var/cache/raspiblitz/info.json EOF # update info.html file -/usr/local/bin/j2 /var/www/blitzweb/info.j2 /var/cache/raspiblitz/info.json -o /var/cache/raspiblitz/info.html +/usr/local/bin/j2 /var/www/blitzweb/info/info.j2 /var/cache/raspiblitz/info.json -o /var/cache/raspiblitz/info.html # EOF diff --git a/home.admin/assets/www_blitzweb/index.html b/home.admin/assets/www_blitzweb/index.html new file mode 100644 index 000000000..2da139ae5 --- /dev/null +++ b/home.admin/assets/www_blitzweb/index.html @@ -0,0 +1,21 @@ + + + + + + + RaspiBlitz Welcome + + + + +
+ +

+ Welcome +

+ +
+ + + diff --git a/home.admin/assets/www_blitzweb/info/index.html b/home.admin/assets/www_blitzweb/info/index.html new file mode 120000 index 000000000..779063a79 --- /dev/null +++ b/home.admin/assets/www_blitzweb/info/index.html @@ -0,0 +1 @@ +/var/cache/raspiblitz/info.html \ No newline at end of file diff --git a/home.admin/assets/www_blitzweb/info.j2 b/home.admin/assets/www_blitzweb/info/info.j2 similarity index 99% rename from home.admin/assets/www_blitzweb/info.j2 rename to home.admin/assets/www_blitzweb/info/info.j2 index ca8918764..7ca8e82e8 100644 --- a/home.admin/assets/www_blitzweb/info.j2 +++ b/home.admin/assets/www_blitzweb/info/info.j2 @@ -3,7 +3,7 @@ RaspiBlitz Status - + diff --git a/home.admin/assets/www_blitzweb/css/status.css b/home.admin/assets/www_blitzweb/info/status.css similarity index 100% rename from home.admin/assets/www_blitzweb/css/status.css rename to home.admin/assets/www_blitzweb/info/status.css diff --git a/home.admin/config.scripts/blitz.web.sh b/home.admin/config.scripts/blitz.web.sh index cc2033897..7905d0e6f 100644 --- a/home.admin/config.scripts/blitz.web.sh +++ b/home.admin/config.scripts/blitz.web.sh @@ -18,11 +18,11 @@ APOST=\' # close tag for linters: ' ################### if [ "$1" = "1" ] || [ "$1" = "on" ]; then - echo "Turn ON: Web" + echo "Turning ON: Web" # install sudo apt-get update >/dev/null - sudo apt-get install -y nginx >/dev/null + sudo apt-get install -y nginx apache2-utils >/dev/null # make sure that it is enabled and started sudo systemctl enable nginx >/dev/null @@ -83,6 +83,17 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then sudo cp /home/admin/assets/blitzweb.conf /etc/nginx/sites-available/blitzweb.conf sudo ln -sf /etc/nginx/sites-available/blitzweb.conf /etc/nginx/sites-enabled/ + if ! [ -f /etc/nginx/.htpasswd ]; then + # ToDo(frennkie) hardcoded admin:changeme <- change it! + echo "changeme" | sudo htpasswd -c -i /etc/nginx/.htpasswd admin + sudo chown www-data:www-data /etc/nginx/.htpasswd + sudo chmod 640 /etc/nginx/.htpasswd + + else + sudo chown www-data:www-data /etc/nginx/.htpasswd + sudo chmod 640 /etc/nginx/.htpasswd + fi + # open firewall sudo ufw allow 443 comment 'nginx https_443' 2>/dev/null @@ -95,7 +106,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then ################### elif [ "$1" = "0" ] || [ "$1" = "off" ]; then - echo "Turn OFF: Web" + echo "Turning OFF: Web" sudo systemctl stop nginx sudo systemctl disable nginx >/dev/null