diff --git a/Kyoo/Controllers/AuthManager.cs b/Kyoo/Controllers/AuthManager.cs index 287dad4f..3c2c382d 100644 --- a/Kyoo/Controllers/AuthManager.cs +++ b/Kyoo/Controllers/AuthManager.cs @@ -87,14 +87,12 @@ namespace Kyoo.Controllers Pkcs12Store store = new Pkcs12StoreBuilder().Build(); store.SetKeyEntry("Kyoo_key", new AsymmetricKeyEntry(subjectKeyPair.Private), new [] {new X509CertificateEntry(bouncyCert)}); - - using (MemoryStream pfxStream = new MemoryStream()) - { - store.Save(pfxStream, password.ToCharArray(), random); - certificate = new X509Certificate2(pfxStream.ToArray(), password, X509KeyStorageFlags.Exportable); - using FileStream fileStream = File.OpenWrite(file); - pfxStream.WriteTo(fileStream); - } + + using MemoryStream pfxStream = new MemoryStream(); + store.Save(pfxStream, password.ToCharArray(), random); + certificate = new X509Certificate2(pfxStream.ToArray(), password, X509KeyStorageFlags.Exportable); + using FileStream fileStream = File.OpenWrite(file); + pfxStream.WriteTo(fileStream); return certificate; } } diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index af287686..c73f5ad2 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -50,7 +50,7 @@ - + diff --git a/Kyoo/Startup.cs b/Kyoo/Startup.cs index fc738d26..990b714e 100644 --- a/Kyoo/Startup.cs +++ b/Kyoo/Startup.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Reflection; using IdentityServer4.Services; using Kyoo.Api; @@ -37,7 +38,7 @@ namespace Kyoo { services.AddSpaStaticFiles(configuration => { - configuration.RootPath = "wwwroot"; + configuration.RootPath = Path.Join(AppDomain.CurrentDomain.BaseDirectory, "wwwroot"); }); services.AddControllers() @@ -192,7 +193,7 @@ namespace Kyoo app.UseSpa(spa => { - spa.Options.SourcePath = "Views/WebClient"; + spa.Options.SourcePath = Path.Join(AppDomain.CurrentDomain.BaseDirectory, "Views/WebClient"); if (env.IsDevelopment()) { diff --git a/install/aur/.gitignore b/install/aur/.gitignore new file mode 100644 index 00000000..936548d0 --- /dev/null +++ b/install/aur/.gitignore @@ -0,0 +1,5 @@ +Kyoo/ +src/ +pkg/ +kyoo-1.0.0-1-x86_64.pkg.tar.zst + diff --git a/install/aur/PKGBUILD b/install/aur/PKGBUILD index a45b2584..082b5874 100644 --- a/install/aur/PKGBUILD +++ b/install/aur/PKGBUILD @@ -31,7 +31,9 @@ build() { package() { mkdir -p "$pkgdir/usr/lib" + mkdir -p "$pkgdir/var/lib/kyoo" cp -r --no-preserve ownership "$srcdir/output" "$pkgdir/usr/lib/kyoo" + mv "$pkgdir/usr/lib/kyoo/appsettings.json" "$pkgdir/var/lib/kyoo/" install -Dm 644 kyoo.service -t "$pkgdir/usr/lib/systemd/system/" install -Dm 644 kyoo.sysusers "$pkgdir/usr/lib/sysusers.d/kyoo.conf" } diff --git a/install/aur/kyoo.service b/install/aur/kyoo.service index a0ea7435..ceacfe65 100644 --- a/install/aur/kyoo.service +++ b/install/aur/kyoo.service @@ -4,8 +4,7 @@ After=network.target [Service] User=kyoo -WorkingDirectory=/usr/lib/kyoo -ExecStart=/usr/bin/dotnet kyoo.dll +ExecStart=/usr/lib/kyoo/Kyoo /var/lib/kyoo Restart=on-abort TimeoutSec=20