Merge pull request #99 from franklupo/main

Fix HTTPS proxy #67
Corsinvest · Apr 2, 2024 · a6b4a06 · a6b4a06
2 parents fb1d474 + aae0d6a
commit a6b4a06
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/cmd/Build.ps1 b/cmd/Build.ps1
@@ -24,7 +24,7 @@ $pathBinRelase = "$pathBasePrj\Bin\Release\net8.0"
 Remove-Item -Path ".\$pathBinRelase"  -Recurse -Force
 
 $fileName = "cv4pve-admin"
-$rids = @("linux-x64", "linux-arm", "linux-arm64", "osx-x64", "win-x86", "win-x64", "win-arm", "win-arm64")
+$rids = @("linux-x64", "linux-arm", "linux-arm64", "osx-x64", "win-x86", "win-x64", "win-arm64")
 foreach ($rid in $rids) {
     dotnet publish "$pathBasePrj\Corsinvest.ProxmoxVE.Admin.csproj" `
             -r $rid `

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Corsinvest.ProxmoxVE.Admin.Core.csproj b/src/Corsinvest.ProxmoxVE.Admin.Core/Corsinvest.ProxmoxVE.Admin.Core.csproj
@@ -5,14 +5,14 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Corsinvest.AppHero.Core.MudBlazorUI" Version="0.1.10" />
+    <PackageReference Include="Corsinvest.AppHero.Core.MudBlazorUI" Version="0.1.11" />
     <PackageReference Include="QuestPDF" Version="2023.12.6" />
     <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.1" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
     <PackageReference Include="Blazor-ApexCharts" Version="3.1.0" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-    <PackageReference Include="Corsinvest.ProxmoxVE.Api.Extension" Version="8.1.4" />
+    <PackageReference Include="Corsinvest.ProxmoxVE.Api.Extension" Version="8.1.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
     <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.102.2.1" />
     <PackageReference Include="SSH.NET" Version="2024.0.0" />

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Helpers/PveAdminHelper.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Helpers/PveAdminHelper.cs
@@ -123,10 +123,6 @@ public static async Task<string> GetSupportInfo(PveClient client)
 
         foreach (var item in items)
         {
-            var aa = disks.Where(a => a.VmId == item.VmId
-                                       && (!a.HostContainSnapshot || a.Host == item.Node))
-                          .ToArray();
-
             item.SnapshotsSize = disks.Where(a => a.VmId == item.VmId
                                                     && (!a.HostContainSnapshot || a.Host == item.Node))
                                       .SelectMany(a => a.Snapshots)

diff --git a/src/Corsinvest.ProxmoxVE.Admin/Corsinvest.ProxmoxVE.Admin.csproj b/src/Corsinvest.ProxmoxVE.Admin/Corsinvest.ProxmoxVE.Admin.csproj
@@ -7,13 +7,13 @@
 	<Import Project="..\common.props" />
 
 	<ItemGroup>
-		<PackageReference Include="Corsinvest.AppHero.Auditing.MudBlazorUI" Version="0.1.10" />
-		<PackageReference Include="Corsinvest.AppHero.HangFire" Version="0.1.10" />
-		<PackageReference Include="Corsinvest.AppHero.Notification" Version="0.1.10" />
-		<PackageReference Include="Corsinvest.AppHero.Serilog" Version="0.1.10" />
-		<PackageReference Include="Corsinvest.AppHero.Translation" Version="0.1.10" />
-		<PackageReference Include="Corsinvest.AppHero.Core.MudBlazorUI" Version="0.1.10" />
-		<PackageReference Include="Corsinvest.AppHero.Localization.MudBlazorUI" Version="0.1.10" />
+		<PackageReference Include="Corsinvest.AppHero.Auditing.MudBlazorUI" Version="0.1.11" />
+		<PackageReference Include="Corsinvest.AppHero.HangFire" Version="0.1.11" />
+		<PackageReference Include="Corsinvest.AppHero.Notification" Version="0.1.11" />
+		<PackageReference Include="Corsinvest.AppHero.Serilog" Version="0.1.11" />
+		<PackageReference Include="Corsinvest.AppHero.Translation" Version="0.1.11" />
+		<PackageReference Include="Corsinvest.AppHero.Core.MudBlazorUI" Version="0.1.11" />
+		<PackageReference Include="Corsinvest.AppHero.Localization.MudBlazorUI" Version="0.1.11" />
 
 		<PackageReference Include="Serilog.Sinks.SQLite" Version="6.0.0" />
 		<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />

diff --git a/src/Corsinvest.ProxmoxVE.Admin/wwwroot/doc/index.adoc b/src/Corsinvest.ProxmoxVE.Admin/wwwroot/doc/index.adoc
@@ -11,7 +11,7 @@ Powered by Corsinvest Srl
 :icons: font
 :pve-name: Proxmox VE
 :app-name: cv4pve-admin
-:app-version: v1.1.0
+:app-version: v1.1.1
 :app-url-site: https://www.corsinvest.it/cv4pve-admin
 :company-url: https://www.corsinvest.it
 :company-name: Corsinvest Srl

diff --git a/src/Corsinvest.ProxmoxVE.Admin/wwwroot/doc/index.html b/src/Corsinvest.ProxmoxVE.Admin/wwwroot/doc/index.html
@@ -439,7 +439,7 @@
 </head>
 <body class="book toc2 toc-left">
 <div id="header">
-<h1>CV4PVE-ADMIN v1.1.0 Guide</h1>
+<h1>CV4PVE-ADMIN v1.1.1 Guide</h1>
 <div class="details">
 <span id="author" class="author">Powered by Corsinvest Srl</span><br>
 </div>
@@ -1841,7 +1841,7 @@ <h4 id="_commercial_support">6.1.1. Commercial Support</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-27 16:15:19 UTC
+Last updated 2024-03-29 18:19:03 UTC
 </div>
 </div>
 </body>

diff --git a/src/Docker/Nginx/ReverseProxy/.env b/src/Docker/Nginx/ReverseProxy/.env
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 DATA_STORE=d:/DockerData/cv4pve-admin/
-VERSION=1.0.0-rc.3
+VERSION=1.1.1
diff --git a/src/Docker/Nginx/ReverseProxy/docker-compose.yml b/src/Docker/Nginx/ReverseProxy/docker-compose.yml
@@ -6,7 +6,7 @@ services:
   cv4pve-admin:
      image: corsinvest/cv4pve-admin:${VERSION}
      ports:
-       - "5000:5000"
+       - "5001:5000"
      environment:
        - TZ=Europe/Rome
      volumes: