Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1354 from benjamink/webmin-via-url-path 

Config Nginx to serve Webmin via /webmin path
This commit is contained in:
Benjamin Krein 2023-11-17 05:54:29 -05:00 committed by GitHub
parent 984a2e11dd ee934c880c
commit abedf4ed23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
easyinstall.sh
View File

@ -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

6
python/web/service-infra/nginx-default.conf
View File

@ -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;

1
python/web/src/static/themes/modern/icons/external-link.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
Side by Side

After

Width:  |  Height:  |  Size: 388 B

4
python/web/src/static/themes/modern/style.css
View File

@ -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

27
python/web/src/templates/admin.html
View File

@ -120,18 +120,18 @@
<ul class="service_status">
{% if netatalk_configured %}
<li class="service-item enabled">
{{ _("Mac AFP file sharing is enabled.") }}
{{ _("Mac AFP file sharing is enabled.") }}
{% else %}
<li class="service-item disabled">
{{ _("Mac AFP file sharing is disabled.") }}
{% endif %}
</li>
{% if webmin_configured %}
<li>
<a href="https://{{ env["ip_addr"] }}:10000/netatalk2/" target=\"_blank\">
{{ _("Manage the AFP server") }}
</a>
</li>
<ul>
<li class="service-item extlink">
<a href="../webmin/netatalk2/" target=\"_blank\">{{ _("Manage the AFP server") }}</a>
</li>
</ul>
{% endif %}
{% if samba_configured %}
<li class="service-item enabled">
@ -142,11 +142,11 @@
{% endif %}
</li>
{% if webmin_configured %}
<li>
<a href="https://{{ env["ip_addr"] }}:10000/samba/" target=\"_blank\">
{{ _("Manage the SMB server") }}
</a>
</li>
<ul>
<li class="service-item extlink">
<a href="../webmin/samba/" target=\"_blank\">{{ _("Manage the SMB server") }}</a>
</li>
</ul>
{% endif %}
{% if ftp_configured %}
<li class="service-item enabled">
@ -164,6 +164,11 @@
{{ _("Vintage web proxy is disabled.") }}
{% endif %}
</li>
{% if webmin_configured %}
<li class="service-item extlink">
<a href="../webmin/" target=\"_blank\">{{ _("Manage PiSCSI services & Linux with Webmin") }}</a>
</li>
{% endif %}
</ul>
</section>