Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-21 08:29:59 +00:00
Code Issues Projects Releases Wiki Activity

Revert moving webmin to sub-path (#1381)

Browse Source 
This reverts the parts of #1354 that moved Webmin to a URL sub-path
`/webmin` which is breaking Webmin authentication.

Issue #1380 has been opened to re-address moving Webmin to a sub-path
properly in a future change.

This PR retains the Settings page UI tweaks to Webmin but just uses the
direct URL to port `10000`.
This commit is contained in:
Benjamin Krein 2023-11-18 19:57:16 -05:00 committed by GitHub
commit e6f23662c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
easyinstall.sh
View File

@ -986,10 +986,6 @@ 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,12 +18,6 @@ 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;

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

@ -129,7 +129,7 @@
{% if webmin_configured %}
<ul>
<li class="service-item extlink">
<a href="../webmin/netatalk2/" target=\"_blank\">{{ _("Manage the AFP server") }}</a>
<a href="https://{{ env["ip_addr"] }}:10000/netatalk2/" target=\"_blank\">{{ _("Manage the AFP server") }}</a>
</li>
</ul>
{% endif %}
@ -144,7 +144,7 @@
{% if webmin_configured %}
<ul>
<li class="service-item extlink">
<a href="../webmin/samba/" target=\"_blank\">{{ _("Manage the SMB server") }}</a>
<a href="https://{{ env["ip_addr"] }}:10000/webmin/samba/" target=\"_blank\">{{ _("Manage the SMB server") }}</a>
</li>
</ul>
{% endif %}
@ -166,7 +166,7 @@
</li>
{% if webmin_configured %}
<li class="service-item extlink">
<a href="../webmin/" target=\"_blank\">{{ _("Manage PiSCSI services & Linux with Webmin") }}</a>
<a href="https://{{ env["ip_addr"] }}:10000/" target=\"_blank\">{{ _("Manage PiSCSI services & Linux with Webmin") }}</a>
</li>
{% endif %}
</ul>