diff --git a/easyinstall.sh b/easyinstall.sh index c605980b..8c9394ef 100755 --- a/easyinstall.sh +++ b/easyinstall.sh @@ -986,6 +986,10 @@ function installWebmin() { sudo sed -i 's@/usr/sbin@/usr/local/sbin@' "$WEBMIN_MODULE_CONFIG" fi rm netatalk2-wbm.tgz || true + + # Configure Webmin to be accessible from a '/webmin' URL path + echo "webprefix=/webmin" | sudo tee -a /etc/webmin/config + echo "webprefixnoredir=1" | sudo tee -a /etc/webmin/config } # updates configuration files and installs packages needed for the OLED screen script diff --git a/python/web/service-infra/nginx-default.conf b/python/web/service-infra/nginx-default.conf index 575bca56..ec76431d 100644 --- a/python/web/service-infra/nginx-default.conf +++ b/python/web/service-infra/nginx-default.conf @@ -18,6 +18,12 @@ server { proxy_pass http://127.0.0.1:8080; } + # Configure Webmin to be accessed via '/webmin' URL path + # NOTE: Use of 'https' here is required as is the trailing '/' + location /webmin { + proxy_pass https://127.0.0.1:10000/; + } + # Large files client_max_body_size 0; proxy_read_timeout 1000; diff --git a/python/web/src/static/themes/modern/icons/external-link.svg b/python/web/src/static/themes/modern/icons/external-link.svg new file mode 100644 index 00000000..6236df3e --- /dev/null +++ b/python/web/src/static/themes/modern/icons/external-link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/python/web/src/static/themes/modern/style.css b/python/web/src/static/themes/modern/style.css index e057da98..ad993af2 100644 --- a/python/web/src/static/themes/modern/style.css +++ b/python/web/src/static/themes/modern/style.css @@ -971,6 +971,10 @@ section#services li.disabled { background: url("icons/cloud-off.svg") no-repeat left center; } +section#services li.extlink { + background: url("icons/external-link.svg") no-repeat left center; +} + /* ------------------------------------------------------------------------------ Drives page diff --git a/python/web/src/templates/admin.html b/python/web/src/templates/admin.html index c28d41a4..40484364 100644 --- a/python/web/src/templates/admin.html +++ b/python/web/src/templates/admin.html @@ -120,18 +120,18 @@