fergalmoran/tvnoms
1
0
Fork 0
mirror of https://github.com/fergalmoran/tvnoms.git synced 2025-12-22 01:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add URL grabbing middleware and fix aspire startup#

Browse Source
This commit is contained in:
Fergal Moran
2024-04-03 15:19:45 +01:00
parent cef2dd26c4
commit 3ce24ea22a
4 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/tvnoms-server/TvNoms.ApiService/Program.cs
View File

@@ -46,24 +46,24 @@ builder.AddServiceDefaults();
// Add services to the container.
builder.Services.AddProblemDetails();
if (builder.Environment.IsDevelopment()) {
builder.WebHost.ConfigureKestrel(serverOptions => {
var pemFile = builder.Configuration["Startup:PemFile"];
var keyFile = builder.Configuration["Startup:KeyFile"];
var port = int.Parse(builder.Configuration["Startup:Port"] ?? "5001");
if (string.IsNullOrEmpty(pemFile) || string.IsNullOrEmpty(keyFile)) {
throw new InvalidOperationException("Unable to find SSL certificate files.");
}
serverOptions.Listen(IPAddress.Any, port, listenOptions => {
var certPem = File.ReadAllText(pemFile);
var keyPem = File.ReadAllText(keyFile);
var x509 = X509Certificate2.CreateFromPem(certPem, keyPem);
listenOptions.UseHttps(x509);
});
});
}
// if (builder.Environment.IsDevelopment()) {
// builder.WebHost.ConfigureKestrel(serverOptions => {
// var pemFile = builder.Configuration["Startup:PemFile"];
// var keyFile = builder.Configuration["Startup:KeyFile"];
// var port = int.Parse(builder.Configuration["Startup:Port"] ?? "5001");
// if (string.IsNullOrEmpty(pemFile) || string.IsNullOrEmpty(keyFile)) {
// throw new InvalidOperationException("Unable to find SSL certificate files.");
// }
//
// serverOptions.Listen(IPAddress.Any, port, listenOptions => {
// var certPem = File.ReadAllText(pemFile);
// var keyPem = File.ReadAllText(keyFile);
// var x509 = X509Certificate2.CreateFromPem(certPem, keyPem);
//
// listenOptions.UseHttps(x509);
// });
// });
// }
builder.Services.AddDbContext<AppDbContext>(options => {
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");

2
src/tvnoms-server/TvNoms.ApiService/Shared/ServiceCollectionExtensions.cs
View File

@@ -12,7 +12,7 @@ public static class ServiceCollectionExtensions {
options.SwaggerDoc("v1", new OpenApiInfo {
Version = "v1",
Title = assembly.GetName().Name,
Description = "An ASP.NET Core Web API for managing ToDo items",
Description = "TV Noms dotcom API",
TermsOfService = new Uri("https://example.com/terms"),
Contact = new OpenApiContact {
Name = "Example Contact",

15
src/tvnoms-server/TvNoms.ApiService/appsettings.Development.json
View File

@@ -8,10 +8,17 @@
"Microsoft.AspNetCore": "Warning"
}
},
"Startup": {
"Port": 5001,
"PemFile": "/etc/letsencrypt/live/dev.fergl.ie/fullchain.pem",
"KeyFile": "/etc/letsencrypt/live/dev.fergl.ie/privkey.pem"
"Kestrel": {
"Endpoints": {
"HttpsFromPem": {
"Certificate": {
"Path": "/etc/letsencrypt/live/dev.fergl.ie//cert.pem",
"KeyPath": "/etc/letsencrypt/live/dev.fergl.ie/privkey.pem"
},
"Protocols": "Http1AndHttp2AndHttp3",
"Url": "https://tvnoms.dev.fergl.ie:5001"
}
}
},
"GoogleAuthOptions": {
},

5
src/tvnoms-server/TvNoms.AppHost/Program.cs
View File

@@ -2,10 +2,7 @@ var builder = DistributedApplication.CreateBuilder(args);
var apiService = builder
.AddProject<Projects.TvNoms_ApiService>("apiservice")
.WithEnvironment("DOTNET_ROOT_X64", "/home/fergalm/.dotnet")
.WithEnvironment("ASPNETCORE_URLS", "https://tvnoms.dev.fergl.ie:5001");
builder
.AddProject<Projects.TvNoms_Web>("webfrontend")
.WithReference(apiService);
builder.Build().Run();