beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some random patches

Browse source
This commit is contained in:
Marcel Baumgartner 2023-04-14 18:13:51 +02:00
parent 41032d30b0
commit ad2be499db
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Moonlight/App/Helpers/DaemonApiHelper.cs
View file

@ -16,11 +16,13 @@ public class DaemonApiHelper
private string GetApiUrl(Node node) private string GetApiUrl(Node node)
{ {
/* SSL not implemented in moonlight daemon
if(node.Ssl) if(node.Ssl)
return $"https://{node.Fqdn}:{node.MoonlightDaemonPort}/"; return $"https://{node.Fqdn}:{node.MoonlightDaemonPort}/";
else else
return $"http://{node.Fqdn}:{node.MoonlightDaemonPort}/"; return $"http://{node.Fqdn}:{node.MoonlightDaemonPort}/";*/
//return $"https://{node.Fqdn}:{node.HttpPort}/";
return $"http://{node.Fqdn}:{node.MoonlightDaemonPort}/";
} }
public async Task<T> Get<T>(Node node, string resource) public async Task<T> Get<T>(Node node, string resource)

13
Moonlight/App/Helpers/WingsServerConverter.cs
View file

@ -118,12 +118,15 @@ public class WingsServerConverter
foreach (var section in child.GetSection("find").GetChildren()) foreach (var section in child.GetSection("find").GetChildren())
{ {
replaces.Add(new() if (section.Value != null)
{ {
Match = section.Key, replaces.Add(new()
Replace_With = section.Value {
.Replace("{{server.build.default.port}}", def.Port.ToString()) Match = section.Key,
}); Replace_With = section.Value
.Replace("{{server.build.default.port}}", def.Port.ToString())
});
}
} }
wingsServer.Process_Configuration.Configs.Add(new() wingsServer.Process_Configuration.Configs.Add(new()

2
Moonlight/App/Services/ServerService.cs
View file

@ -392,6 +392,8 @@ public class ServerService
public async Task Delete(Server s) public async Task Delete(Server s)
{ {
throw new DisplayException("Deleting a server is currently a bit buggy. So its disabled for your safety");
var server = EnsureNodeData(s); var server = EnsureNodeData(s);
var backups = await GetBackups(server); var backups = await GetBackups(server);

6
Moonlight/Pages/_Layout.cshtml
View file

@ -89,9 +89,9 @@
<script src="https://www.google.com/recaptcha/api.js"></script> <script src="https://www.google.com/recaptcha/api.js"></script>
<script src="http://cdn.jsdelivr.net/npm/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.min.js"></script>
<script src="http://cdn.jsdelivr.net/npm/xterm-addon-search@0.8.2/lib/xterm-addon-search.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/xterm-addon-search@0.8.2/lib/xterm-addon-search.min.js"></script>
<script src="http://cdn.jsdelivr.net/npm/xterm-addon-web-links@0.5.0/lib/xterm-addon-web-links.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/xterm-addon-web-links@0.5.0/lib/xterm-addon-web-links.min.js"></script>
<script src="/assets/js/xtermAddons.js"></script> <script src="/assets/js/xtermAddons.js"></script>