boonkerz/pschelpdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/.idea.PSCHelpdesk/.idea/workspace.xml
This commit is contained in:
DESKTOP-E17406D\boonkerz 2025-05-22 09:38:07 +02:00
commit f5435e6764
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
HetznerServer/Service/ServerService.cs
View File

@ -118,7 +118,7 @@ public class ServerService: IServerService
try try
{ {
client.Connect(); client.Connect();
var command = client.RunCommand("apt upgrade -y && apt auto-remove -y"); var command = client.RunCommand("apt dist-upgrade -y && apt auto-remove -y");
if (command.ExitStatus == 0) if (command.ExitStatus == 0)
{ {
Console.WriteLine(serv.Name + " SUCCESS upgraded apt."); Console.WriteLine(serv.Name + " SUCCESS upgraded apt.");
@ -284,6 +284,52 @@ public class ServerService: IServerService
} }
} }
} }
command = client.RunCommand("docker inspect psc-web-1");
if (command.ExitStatus == 0)
{
JArray web = JArray.Parse(command.Result);
var hostConfigArray = web[0]["HostConfig"];
if (hostConfigArray["RestartPolicy"]["Name"].ToString() == "always")
{
serv.IsRestartAlways = true;
}
var webEnvArray = web[0]["Config"]["Env"];
foreach (String entry in webEnvArray)
{
var webExploded = entry.Split("=");
if (webExploded[0] == "LETSENCRYPT_HOST")
{
var webHosts = webExploded[1].Split(",");
serv.Domains.Clear();
foreach (String dom in webHosts)
{
serv.Domains.Add(new Domain(dom));
}
var httpClient = new HttpClient();
httpClient.DefaultRequestHeaders.Accept.Clear();
httpClient.DefaultRequestHeaders.Accept.Add(
new MediaTypeWithQualityHeaderValue("application/ld+json"));
httpClient.DefaultRequestHeaders.Add("User-Agent", "PSC Client");
try
{
var stringTask = httpClient.GetStringAsync("https://" + webHosts[0] + "/apps/api/system/version");
var msg = await stringTask;
JObject versionMSg = JObject.Parse(msg);
serv.Datum = versionMSg["datum"].ToString();
serv.Release = float.Parse(versionMSg["release"].ToString());
}
catch (Exception ex)
{
}
}
}
}
if (serv.Domains.Count == 0) if (serv.Domains.Count == 0)
{ {