rework: configuration service
- to have it be more dynamic
This commit is contained in:
@@ -9,12 +9,10 @@ namespace CaddyManager.Contracts.Configurations;
|
|||||||
public interface IConfigurationsService
|
public interface IConfigurationsService
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Configurations for Caddy service
|
/// Method extracting the configurations from the appsettings.json file or environment variables base on the
|
||||||
|
/// type of the configuration class to determine the section name
|
||||||
/// </summary>
|
/// </summary>
|
||||||
CaddyServiceConfigurations CaddyServiceConfigurations { get; }
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
/// <summary>
|
T Get<T>() where T : class;
|
||||||
/// Configurations for Docker service
|
|
||||||
/// </summary>
|
|
||||||
DockerServiceConfiguration DockerServiceConfiguration { get; }
|
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,7 @@ public class CaddyService(IConfigurationsService configurationsService) : ICaddy
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private const string CaddyGlobalConfigName = "Caddyfile";
|
private const string CaddyGlobalConfigName = "Caddyfile";
|
||||||
|
|
||||||
private CaddyServiceConfigurations Configurations => configurationsService.CaddyServiceConfigurations;
|
private CaddyServiceConfigurations Configurations => configurationsService.Get<CaddyServiceConfigurations>();
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public List<string> GetExistingCaddyConfigurations()
|
public List<string> GetExistingCaddyConfigurations()
|
||||||
|
|||||||
@@ -10,11 +10,16 @@ namespace CaddyManager.Services.Configurations;
|
|||||||
public class ConfigurationsService(IConfiguration configuration) : IConfigurationsService
|
public class ConfigurationsService(IConfiguration configuration) : IConfigurationsService
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public CaddyServiceConfigurations CaddyServiceConfigurations =>
|
public T Get<T>() where T : class
|
||||||
configuration.GetSection(CaddyServiceConfigurations.Caddy).Get<CaddyServiceConfigurations>() ??
|
{
|
||||||
new CaddyServiceConfigurations();
|
var section = typeof(T).Name;
|
||||||
|
|
||||||
public DockerServiceConfiguration DockerServiceConfiguration =>
|
// Have the configuration section name be the section name without the "Configurations" suffix
|
||||||
configuration.GetSection(DockerServiceConfiguration.Docker).Get<DockerServiceConfiguration>() ??
|
if (section.EndsWith("Configurations"))
|
||||||
new DockerServiceConfiguration();
|
section = section[..^"Configurations".Length];
|
||||||
|
else if (section.EndsWith("Configuration"))
|
||||||
|
section = section[..^"Configuration".Length];
|
||||||
|
|
||||||
|
return configuration.GetSection(section).Get<T>() ?? Activator.CreateInstance<T>();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@ namespace CaddyManager.Services.Docker;
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class DockerService(IConfigurationsService configurationsService) : IDockerService
|
public class DockerService(IConfigurationsService configurationsService) : IDockerService
|
||||||
{
|
{
|
||||||
private DockerServiceConfiguration Configuration => configurationsService.DockerServiceConfiguration;
|
private DockerServiceConfiguration Configuration => configurationsService.Get<DockerServiceConfiguration>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Method to get the container id of the Caddy container by the name configured
|
/// Method to get the container id of the Caddy container by the name configured
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"Microsoft.AspNetCore": "Warning"
|
"Microsoft.AspNetCore": "Warning"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Caddy": {
|
"CaddyService": {
|
||||||
"ConfigDir": "./caddy/config"
|
"ConfigDir": "./caddy/config"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"AllowedHosts": "*",
|
"AllowedHosts": "*",
|
||||||
"Caddy": {
|
"CaddyService": {
|
||||||
"ConfigDir": "/root/compose/caddy/config"
|
"ConfigDir": "/root/compose/caddy/config"
|
||||||
},
|
},
|
||||||
"Docker": {
|
"DockerService": {
|
||||||
"CaddyContainerName": "caddy",
|
"CaddyContainerName": "caddy",
|
||||||
"DockerHost": "unix:///var/run/docker.sock"
|
"DockerHost": "unix:///var/run/docker.sock"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user