some refactor and fail2ban changes

This commit is contained in:
2025-08-15 16:26:10 +02:00
parent f8dabd4e18
commit 3ed8196fa6
10 changed files with 49 additions and 49 deletions

View File

@@ -62,10 +62,10 @@ in {
cloudflareDnsCredentials.file = "${self}/secrets/cloudflareDnsCredentials.age";
wgCredentials.file = "${self}/secrets/wgCredentials.age";
wgSobotkaPrivateKey.file = "${self}/secrets/wgSobotkaPrivateKey.age";
gluetunEnv.file = "${self}/secrets/gluetunEnv.age";
gluetunEnvironment.file = "${self}/secrets/gluetunEnvironment.age";
vaultwardenCloudflared.file = "${self}/secrets/vaultwardenCloudflared.age";
vaultwarden-env.file = "${self}/secrets/vaultwarden-env.age";
homepage-env.file = "${self}/secrets/homepage-env.age";
vaultwardenEnvironment.file = "${self}/secrets/vaultwardenEnvironment.age";
homepageEnvironment.file = "${self}/secrets/homepageEnvironment.age";
pihole.file = "${self}/secrets/pihole.age";
slskd.file = "${self}/secrets/slskd.age";
};

View File

@@ -3,13 +3,13 @@
lib,
...
}: let
service = "homepage-dashboard";
unit = "homepage-dashboard";
cfg = config.server.homepage-dashboard;
srv = config.server;
in {
options.server.homepage-dashboard = {
enable = lib.mkEnableOption {
description = "Enable ${service}";
description = "Enable ${unit}";
};
misc = lib.mkOption {
default = [];
@@ -37,9 +37,9 @@ in {
};
config = lib.mkIf cfg.enable {
services.glances.enable = true;
services.${service} = {
services.${unit} = {
enable = true;
environmentFile = config.age.secrets.homepage-env.path;
environmentFile = config.age.secrets.homepageEnvironment.path;
# customCSS = ''
# @font-face {
# font-family: "VCR OSD Mono";
@@ -248,7 +248,7 @@ in {
services.caddy.virtualHosts."${srv.domain}" = {
useACMEHost = srv.domain;
extraConfig = ''
reverse_proxy http://127.0.0.1:${toString config.services.${service}.listenPort}
reverse_proxy http://127.0.0.1:${toString config.services.${unit}.listenPort}
'';
};
};

View File

@@ -157,7 +157,7 @@ in {
];
volumes = ["/var:/gluetun"];
environmentFiles = [
config.age.secrets.gluetunEnv.path
config.age.secrets.gluetunEnvironment.path
];
environment = {
DEV_MODE = "false";
@@ -185,7 +185,7 @@ in {
"/share/downloads:/downloads:rw"
];
environmentFiles = [
config.age.secrets.gluetunEnv.path
config.age.secrets.gluetunEnvironment.path
];
environment = {
PUID = "994";
@@ -214,7 +214,7 @@ in {
"/share/downloads:/downloads:rw"
];
environmentFiles = [
config.age.secrets.gluetunEnv.path
config.age.secrets.gluetunEnvironment.path
config.age.secrets.slskd.path
];
environment = {