properly inherit enable on servers

This commit is contained in:
Danilo Reyes 2025-09-28 11:14:57 -06:00
parent a376428118
commit b4417a6acd
29 changed files with 105 additions and 99 deletions

View File

@ -1,9 +1,12 @@
{ lib, config, ... }:
let
cfg = config.my.servers.adguardhome;
in
{
options.my.servers.adguardhome.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.servers.adguardhome.enable {
config = lib.mkIf (cfg.enable && config.my.secureHost) {
services.adguardhome = {
enable = true;
inherit (cfg) enable;
mutableSettings = true;
};
};

View File

@ -8,7 +8,7 @@ in
config = lib.mkIf (cfg.enable && config.my.secureHost) {
sops.secrets."private_cache_keys/atticd".sopsFile = ../../secrets/keys.yaml;
services.atticd = {
enable = true;
inherit (cfg) enable;
environmentFile = config.sops.secrets."private_cache_keys/atticd".path;
settings = {
listen = "[::]:${toString cfg.port}";

View File

@ -5,11 +5,10 @@ let
in
{
options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687;
config = {
config = lib.mkIf (cfg.enable && config.my.secureHost) {
my.servers.audiobookshelf.enableSocket = true;
services.audiobookshelf = lib.mkIf cfg.enable {
inherit (cfg) port;
enable = true;
services.audiobookshelf = {
inherit (cfg) enable port;
host = cfg.ip;
group = "piracy";
};

View File

@ -6,7 +6,7 @@ in
{
options.my.servers.bazarr = setup.mkOptions "bazarr" "subs" config.services.bazarr.listenPort;
config.services.bazarr = lib.mkIf cfg.enable {
enable = true;
inherit (cfg) enable;
group = "piracy";
};
}

View File

@ -1,22 +1,25 @@
{ lib, config, ... }:
let
cfg = config.my.servers.firefly-iii;
in
{
options.my.servers.firefly-iii.enable = lib.mkEnableOption "enable";
config =
lib.mkIf
(config.my.servers.firefly-iii.enable && config.my.servers.postgres.enable && config.my.secureHost)
{
sops.secrets.firefly-iii-keyfile = {
owner = config.users.users.firefly-iii.name;
inherit (config.users.users.firefly-iii) group;
};
services.firefly-iii = {
enable = true;
enableNginx = true;
settings = {
APP_KEY_FILE = config.sops.secrets.firefly-iii-keyfile.path;
DB_HOST = config.my.postgresSocket;
DB_CONNECTION = "pgsql";
};
};
options.my.servers.firefly-iii = {
enable = lib.mkEnableOption "enable";
enableProxy = lib.mkEnableOption "enableProxy";
};
config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
sops.secrets.firefly-iii-keyfile = {
owner = config.users.users.firefly-iii.name;
inherit (config.users.users.firefly-iii) group;
};
services.firefly-iii = {
inherit (cfg) enable;
enableNginx = cfg.enableProxy;
settings = {
APP_KEY_FILE = config.sops.secrets.firefly-iii-keyfile.path;
DB_HOST = config.my.postgresSocket;
DB_CONNECTION = "pgsql";
};
};
};
}

View File

@ -5,7 +5,7 @@ let
in
{
options.my.servers.firefox-syncserver = setup.mkOptions "firefox-syncserver" "sync" 4233;
config = {
config = lib.mkIf (cfg.enable && config.my.secureHost) {
# sops.secrets.firefox-syncserver.sopsFile = ../../secrets/env.yaml;
services.firefox-syncserver = {
inherit (cfg) enable;

View File

@ -17,7 +17,7 @@ in
config = lib.mkIf (cfg.enable && config.my.secureHost) {
sops.secrets.gitea.sopsFile = ../../secrets/env.yaml;
services.gitea = {
enable = true;
inherit (cfg) enable;
domain = cfg.host;
rootUrl = cfg.url;
settings = {

View File

@ -16,7 +16,7 @@ in
};
my.servers.homepage.certPath = config.sops.secrets."private-ca/pem".path;
services.homepage-dashboard = lib.mkIf cfg.enable {
enable = true;
inherit (cfg) enable;
listenPort = cfg.port;
environmentFile = config.sops.secrets.homepage.path;
settings = {

View File

@ -23,15 +23,14 @@ let
in
{
options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;
config = {
environment = {
systemPackages = lib.mkIf cfg.enable (
[ pkgs.jellyfin-ffmpeg ] ++ (lib.optional cfg.enableCron [ sub-sync-path ])
);
};
config = lib.mkIf (cfg.enable && config.my.secureHost) {
environment.systemPackages = [
pkgs.jellyfin-ffmpeg
]
++ (lib.optional cfg.enableCron [ sub-sync-path ]);
services = {
jellyfin = lib.mkIf cfg.enable {
enable = true;
jellyfin = {
inherit (cfg) enable;
group = "piracy";
};
nginx = lib.mkIf cfg.enableProxy {

View File

@ -10,7 +10,7 @@ in
owner = config.users.users.kavita.name;
inherit (config.users.users.kavita) group;
};
users.users.kavita = lib.mkIf cfg.enable {
users.users.kavita = {
isSystemUser = true;
group = "kavita";
extraGroups = [
@ -19,7 +19,7 @@ in
];
};
services.kavita = {
enable = true;
inherit (cfg) enable;
tokenKeyFile = config.sops.secrets.kavita-token.path;
};
};

View File

@ -8,7 +8,7 @@ in
config = lib.mkIf (cfg.enable && config.my.secureHost) {
sops.secrets.mealie.sopsFile = ../../secrets/env.yaml;
services.mealie = {
inherit (cfg) port enable;
inherit (cfg) enable port;
settings = {
TZ = config.my.timeZone;
DEFAULT_GROUP = "Home";

View File

@ -5,8 +5,8 @@ let
in
{
options.my.servers.microbin = setup.mkOptions "microbin" "copy" 8086;
config.services.microbin = lib.mkIf cfg.enable {
enable = true;
config.services.microbin = lib.mkIf (cfg.enable && config.my.secureHost) {
inherit (cfg) enable;
settings = {
MICROBIN_PORT = cfg.port;
MICROBIN_HIDE_LOGO = false;

View File

@ -229,7 +229,7 @@ in
"--device=/dev/dri" # VA-API (omit for NVENC)
];
};
collabora = lib.mkIf config.my.servers.collabora.enable {
collabora = lib.mkIf cfgC.enable {
autoStart = true;
image = "collabora/code";
imageFile = pkgs.dockerTools.pullImage {
@ -255,7 +255,7 @@ in
];
};
};
systemd = lib.mkIf config.my.servers.nextcloud.enableCron {
systemd = lib.mkIf cfg.enableCron {
services = {
nextcloud-cron.path = [ pkgs.perl ];
nextcloud-cronjob =

View File

@ -13,9 +13,8 @@ in
config = lib.mkIf (cfg.enable && config.my.secureHost) {
sops.secrets."private_cache_keys/miniserver".sopsFile = ../../secrets/keys.yaml;
services.nix-serve = {
enable = true;
inherit (cfg) enable port;
package = pkgs.nix-serve-ng;
inherit (cfg) port;
secretKeyFile = config.sops.secrets."private_cache_keys/miniserver".path;
};
};

View File

@ -6,7 +6,6 @@ in
{
options.my.servers.ombi = setup.mkOptions "ombi" "requests" 3425;
config.services.ombi = lib.mkIf cfg.enable {
enable = true;
inherit (cfg) port;
inherit (cfg) enable port;
};
}

View File

@ -1,10 +1,13 @@
{ lib, config, ... }:
let
cfg = config.my.servers.paperless;
in
{
options.my.servers.paperless.enable = lib.mkEnableOption "enable";
config = lib.mkIf (config.my.servers.paperless.enable && config.my.servers.postgres.enable) {
config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable) {
networking.firewall.allowedTCPPorts = [ config.services.paperless.port ];
services.paperless = {
enable = true;
inherit (cfg) enable;
address = "0.0.0.0";
consumptionDirIsPublic = true;
consumptionDir = "/srv/pool/scans/";

View File

@ -9,9 +9,9 @@ let
in
{
options.my.servers.plex = setup.mkOptions "plex" "plex" 32400;
config.services = {
plex = lib.mkIf cfg.enable {
enable = true;
config.services = lib.mkIf (cfg.enable && config.my.secureHost) {
plex = {
inherit (cfg) enable;
group = "piracy";
};
nginx = lib.mkIf cfg.enableProxy {

View File

@ -5,6 +5,7 @@
...
}:
let
cfg = config.my.servers.postgres;
# upgrade here first, then below.
upgrade-pg-cluster =
let
@ -42,10 +43,10 @@ let
in
{
options.my.servers.postgres.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.servers.postgres.enable {
config = lib.mkIf cfg.enable {
environment.systemPackages = [ upgrade-pg-cluster ];
services.postgresql = {
enable = true;
inherit (cfg) enable;
enableTCPIP = true;
ensureDatabases = dbNames;
package = pkgs.postgresql_17;

View File

@ -9,14 +9,18 @@ let
in
{
options.my.servers.prowlarr = setup.mkOptions "prowlarr" "indexer" 9696;
config = {
users.users.prowlarr = lib.mkIf cfg.enable {
config = lib.mkIf cfg.enable {
users.users.prowlarr = {
group = "piracy";
isSystemUser = true;
};
services = {
prowlarr.enable = cfg.enable;
flaresolverr.enable = cfg.enable;
prowlarr = {
inherit (cfg) enable;
};
flaresolverr = {
inherit (cfg) enable;
};
};
};
}

View File

@ -5,9 +5,9 @@ let
in
{
options.my.servers.radarr = setup.mkOptions "radarr" "movies" 7878;
config = lib.mkIf (cfg.enable && config.my.secureHost) {
config = lib.mkIf cfg.enable {
services.radarr = {
enable = true;
inherit (cfg) enable;
group = "piracy";
};
};

View File

@ -8,7 +8,7 @@ in
config = lib.mkIf (cfg.enable && config.my.secureHost) {
sops.secrets.readeck.sopsFile = ../../secrets/env.yaml;
services.readeck = {
enable = true;
inherit (cfg) enable;
environmentFile = config.sops.secrets.readeck.path;
settings = {
main = {

View File

@ -5,22 +5,19 @@ let
in
{
options.my.servers.ryot = setup.mkOptions "ryot" "tracker" 8765;
config =
lib.mkIf
(config.my.servers.ryot.enable && config.my.servers.postgres.enable && config.my.secureHost)
{
sops.secrets.ryot.sopsFile = ../../secrets/env.yaml;
virtualisation.oci-containers.containers.ryot = {
image = "ghcr.io/ignisda/ryot:v9.2.0";
ports = [ "${toString cfg.port}:8000" ];
environmentFiles = [ config.sops.secrets.ryot.path ];
environment = {
RUST_LOG = "ryot=debug,sea_orm=debug";
TZ = config.my.timeZone;
DATABASE_URL = "postgres:///ryot?host=${config.my.postgresSocket}";
FRONTEND_INSECURE_COOKIES = "true";
};
volumes = [ "${config.my.postgresSocket}:${config.my.postgresSocket}" ];
};
config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
sops.secrets.ryot.sopsFile = ../../secrets/env.yaml;
virtualisation.oci-containers.containers.ryot = {
image = "ghcr.io/ignisda/ryot:v9.2.0";
ports = [ "${toString cfg.port}:8000" ];
environmentFiles = [ config.sops.secrets.ryot.path ];
environment = {
RUST_LOG = "ryot=debug,sea_orm=debug";
TZ = config.my.timeZone;
DATABASE_URL = "postgres:///ryot?host=${config.my.postgresSocket}";
FRONTEND_INSECURE_COOKIES = "true";
};
volumes = [ "${config.my.postgresSocket}:${config.my.postgresSocket}" ];
};
};
}

View File

@ -1,4 +1,7 @@
{ lib, config, ... }:
let
cfg = config.my.servers.sabnzbd;
in
{
options.my.servers.sabnzbd = {
enable = lib.mkEnableOption "enable";
@ -8,9 +11,9 @@
description = "The port to access sabnzbd web-ui";
};
};
config = lib.mkIf config.my.servers.sabnzbd.enable {
config = lib.mkIf cfg.enable {
services.sabnzbd = {
enable = true;
inherit (cfg) enable;
group = "piracy";
};
};

View File

@ -5,16 +5,12 @@ let
in
{
options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
config =
lib.mkIf
(config.my.servers.shiori.enable && config.my.servers.postgres.enable && config.my.secureHost)
{
sops.secrets.shiori.sopsFile = ../../secrets/env.yaml;
services.shiori = {
inherit (cfg) port;
enable = true;
environmentFile = config.sops.secrets.shiori.path;
databaseUrl = "postgres:///shiori?host=${config.my.postgresSocket}";
};
};
config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
sops.secrets.shiori.sopsFile = ../../secrets/env.yaml;
services.shiori = {
inherit (cfg) enable port;
environmentFile = config.sops.secrets.shiori.path;
databaseUrl = "postgres:///shiori?host=${config.my.postgresSocket}";
};
};
}

View File

@ -6,7 +6,7 @@ in
{
options.my.servers.sonarr = setup.mkOptions "sonarr" "series" 8989;
config.services.sonarr = lib.mkIf cfg.enable {
enable = true;
inherit (cfg) enable;
group = "piracy";
};
}

View File

@ -12,7 +12,7 @@ in
"stash/session".sopsFile = ../../secrets/env.yaml;
};
services.stash = {
enable = true;
inherit (cfg) enable;
group = "piracy";
mutableSettings = true;
username = "Suing8150";

View File

@ -52,7 +52,7 @@ in
networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];
services = {
matrix-synapse = {
enable = true;
inherit (cfg) enable;
extraConfigFiles = [
config.sops.secrets.synapse.path
];

View File

@ -5,8 +5,8 @@ let
in
{
options.my.servers.tranga = setup.mkOptions "tranga" "tranga" 9555;
config = {
virtualisation.oci-containers.containers = lib.mkIf cfg.enable {
config = lib.mkIf cfg.enable {
virtualisation.oci-containers.containers = {
tranga-api = {
image = "glax/tranga-api:latest";
user = "${toString config.users.users.jawz.uid}:${toString config.users.groups.kavita.gid}";

View File

@ -13,7 +13,7 @@ in
config = lib.mkIf (cfg.enable && config.my.servers.postgres.enable && config.my.secureHost) {
sops.secrets.vaultwarden.sopsFile = ../../secrets/env.yaml;
services.vaultwarden = {
enable = true;
inherit (cfg) enable;
dbBackend = "postgresql";
package = pkgs.vaultwarden;
environmentFile = config.sops.secrets.vaultwarden.path;