From c6036bb3a72f781bc14ecaad3e2baeceeccdfe73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Barnouin?= Date: Thu, 15 May 2025 09:27:18 +0200 Subject: [PATCH] Change docker name to qbittorrent-vpn --- flake.nix | 4 +- secrets.nix | 8 +- .../{docker => qbittorrent-vpn}/default.nix | 87 +------------------ .../secrets/docker-gluetun-env.age | 0 .../secrets/docker-qbittorrent-env.age | 0 5 files changed, 8 insertions(+), 91 deletions(-) rename services/{docker => qbittorrent-vpn}/default.nix (59%) rename services/{docker => qbittorrent-vpn}/secrets/docker-gluetun-env.age (100%) rename services/{docker => qbittorrent-vpn}/secrets/docker-qbittorrent-env.age (100%) diff --git a/flake.nix b/flake.nix index a9ad38e..07d1005 100644 --- a/flake.nix +++ b/flake.nix @@ -119,7 +119,7 @@ } ]; }; - docker = nixpkgs.lib.nixosSystem { + qbittorrent_vpn = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs; }; modules = [ @@ -130,7 +130,7 @@ "${inputs.self}/services" "${inputs.self}/modules" { - services.vm_docker = { + services.vm_qbittorrent_vpn = { enable = true; }; } diff --git a/secrets.nix b/secrets.nix index 8a4e5b2..5c8f1d6 100644 --- a/secrets.nix +++ b/secrets.nix @@ -9,7 +9,7 @@ let forgejo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMf3Cc/S0p/LFcW+RLMEqpxOOv8q/HrKO4I9joHmRxl root@forgejo"; nginx = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKX2wkS9bpMy1+ITPtQclRkthOwksWBZOLa3bT9oLAe1 root@nixos-nginx"; jellyfin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBiJb+U6LQ3KglTJqdUzwCVkKWqYoBuJXZ8BXXgCMqN5 root@jellyfin"; - docker = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2n8jioazInEa0vfXY5gGcntOH4+yBV9VkdxvwEKCqA root@docker"; + qbittorrent-vpn = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2n8jioazInEa0vfXY5gGcntOH4+yBV9VkdxvwEKCqA root@docker"; nixarr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICbGn92P4OxaGWiQDrAbE8NhFp8UCtkfSzX2fkEv+ckk root@arr-box"; systems = [grafana onlyoffice postgresql forgejo nginx jellyfin]; @@ -42,9 +42,9 @@ in { "secrets/redis-lapi-key.age".publicKeys = [tbarnouin redis]; - "services/docker/secrets/docker-gluetun-env.age".publicKeys = [tbarnouin docker]; - "services/docker/secrets/docker-qbittorrent-env.age".publicKeys = [tbarnouin docker]; - "secrets/docker-lapi-key.age".publicKeys = [tbarnouin docker]; + "services/qbittorrent_vpn/secrets/docker-gluetun-env.age".publicKeys = [tbarnouin qbittorrent-vpn]; + "services/qbittorrent_vpn/secrets/docker-qbittorrent-env.age".publicKeys = [tbarnouin qbittorrent-vpn]; + "secrets/docker-lapi-key.age".publicKeys = [tbarnouin qbittorrent-vpn]; "secrets/nixarr-lapi-key.age".publicKeys = [tbarnouin nixarr]; } diff --git a/services/docker/default.nix b/services/qbittorrent-vpn/default.nix similarity index 59% rename from services/docker/default.nix rename to services/qbittorrent-vpn/default.nix index 86ac2da..01e1e82 100644 --- a/services/docker/default.nix +++ b/services/qbittorrent-vpn/default.nix @@ -4,14 +4,10 @@ lib, ... }: let - cfg = config.services.vm_docker; + cfg = config.services.vm_qbittorrent_vpn; in { - options.services.vm_docker = { + options.services.vm_qbittorrent_vpn = { enable = lib.mkEnableOption "Enable minimal config"; - pgsql_ip = lib.mkOption { - type = lib.types.str; - description = "docker database IP address"; - }; }; config = lib.mkIf cfg.enable { age.secrets = { @@ -126,85 +122,6 @@ in { log-driver = "journald"; extraOptions = ["--network=container:gluetun"]; }; - "bazarr" = { - image = "linuxserver/bazarr"; - environment = { - "PGID" = "1000"; - "PUID" = "1000"; - "TZ" = "\"Europe/Paris\""; - }; - volumes = [ - "/home/tbarnouin/bazarr:/config:rw" - "/mnt/media:/downloads:rw" - ]; - ports = [ - "6767:6767/tcp" - ]; - log-driver = "journald"; - }; - "jellyseerr" = { - image = "fallenbagel/jellyseerr:latest"; - environment = { - "LOG_LEVEL" = "debug"; - "TZ" = "\"Europe/Paris\""; - }; - volumes = [ - "/home/tbarnouin/jellyseerr:/app/config:rw" - ]; - ports = [ - "5055:5055/tcp" - ]; - log-driver = "journald"; - }; - "prowlarr" = { - image = "lscr.io/linuxserver/prowlarr:latest"; - environment = { - "PGID" = "1000"; - "PUID" = "1000"; - "TZ" = "\"Europe/Paris\""; - }; - volumes = [ - "/home/tbarnouin/prowlarr:/config:rw" - "/mnt/media:/downloads:rw" - ]; - ports = [ - "9696:9696/tcp" - ]; - log-driver = "journald"; - extraOptions = ["--dns=192.168.1.90"]; - }; - "radarr" = { - image = "lscr.io/linuxserver/radarr:latest"; - environment = { - "PGID" = "1000"; - "PUID" = "1000"; - "TZ" = "\"Europe/Paris\""; - }; - volumes = [ - "/home/tbarnouin/radarr:/config:rw" - "/mnt/media:/downloads:rw" - ]; - ports = [ - "7878:7878/tcp" - ]; - log-driver = "journald"; - }; - "sonarr" = { - image = "lscr.io/linuxserver/sonarr:latest"; - environment = { - "PGID" = "1000"; - "PUID" = "1000"; - "TZ" = "\"Europe/Paris\""; - }; - volumes = [ - "/home/tbarnouin/sonarr:/config:rw" - "/mnt/media:/downloads:rw" - ]; - ports = [ - "8989:8989/tcp" - ]; - log-driver = "journald"; - }; }; }; }; diff --git a/services/docker/secrets/docker-gluetun-env.age b/services/qbittorrent-vpn/secrets/docker-gluetun-env.age similarity index 100% rename from services/docker/secrets/docker-gluetun-env.age rename to services/qbittorrent-vpn/secrets/docker-gluetun-env.age diff --git a/services/docker/secrets/docker-qbittorrent-env.age b/services/qbittorrent-vpn/secrets/docker-qbittorrent-env.age similarity index 100% rename from services/docker/secrets/docker-qbittorrent-env.age rename to services/qbittorrent-vpn/secrets/docker-qbittorrent-env.age