Browse Source

Some random patches

Marcel Baumgartner 2 years ago
parent
commit
ad2be499db

+ 4 - 2
Moonlight/App/Helpers/DaemonApiHelper.cs

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

+ 8 - 5
Moonlight/App/Helpers/WingsServerConverter.cs

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

+ 2 - 0
Moonlight/App/Services/ServerService.cs

@@ -392,6 +392,8 @@ public class ServerService
 
     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 backups = await GetBackups(server);

+ 3 - 3
Moonlight/Pages/_Layout.cshtml

@@ -89,9 +89,9 @@
 
 <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="http://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-fit@0.5.0/lib/xterm-addon-fit.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="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>