Add master server Web Root config

Add web_root option to the master server and use it create URLs for
resources hosted by it.  This permits hosting the master server web
interface behind reverse proxy under a dedicated path.
This commit is contained in:
Hornwitser committed 2020-04-04 10:05:37 +02:00
1 parent 5e9d9097e1
commit 8ebf0fc754
9 files changed
+27 -15

No files matched your search

+8 -7
View File
@@ -1,12 +1,13 @@
<title>Clusterio</title>
<link rel="stylesheet" type="text/css" href="/style.css">
<script src="/external/jquery.js"></script>
<script src="/external/jquery-ui.js"></script>
<script src="/external/moment.min.js"></script>
<script src="/external/mousetrap.min.js"></script>
<script src="/main.js"></script>
<link href="/bootstrap.min.css" rel="stylesheet">
<link href="/external/css/Roboto.css" rel="stylesheet">
<script>root = "<%= locals.root %>";</script>
<script src="<%= locals.root %>external/jquery.js"></script>
<script src="<%= locals.root %>external/jquery-ui.js"></script>
<script src="<%= locals.root %>external/moment.min.js"></script>
<script src="<%= locals.root %>external/mousetrap.min.js"></script>
<script src="<%= locals.root %>main.js"></script>
<link href="<%= locals.root %>bootstrap.min.css" rel="stylesheet">
<link href="<%= locals.root %>external/css/Roboto.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.0/css/all.css" integrity="sha384-aOkxzJ5uQz7WBObEZcHvV5JvRW3TUc2rNPA7pe3AwnsUohiw1Vj2Rgx2KSOkF5+h" crossorigin="anonymous">
<link rel="apple-touch-icon" sizes="57x57" href="/favicon/apple-icon-57x57.png">
+3 -3
View File
@@ -1,12 +1,12 @@
<nav class="navbar nav-pills nav-fill">
<div class="nav-item col-3">
<a class="navbar-brand border-0" href="/">
<img src="/pictures/logo.png" width="50" height="50" class="d-inline-block align-middle " alt=""/>
<img src="<%= locals.root %>pictures/logo.png" width="50" height="50" class="d-inline-block align-middle " alt=""/>
<h3 class=" ml-3 nav-title">Clusterio</h3>
</a>
</div>
<div class="nav-item mr-1">
<a class="nav-link align-middle" href="/nodes">Slaves</a>
<a class="nav-link align-middle" href="<%= locals.root %>nodes">Slaves</a>
</div><%
for (let plug of locals.masterPlugins.values()) {
if (
@@ -24,6 +24,6 @@ for (let plug of locals.masterPlugins.values()) {
}
} %>
<div class="nav-item">
<a class="nav-link align-middle" href="/settings">Settings</a>
<a class="nav-link align-middle" href="<%= locals.root %>settings">Settings</a>
</div>
</nav>