From 0f09750417d15b3b41c1ec53d7e254a28e81fffd Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Thu, 4 Jul 2024 15:26:07 -0600 Subject: [PATCH] changed backend to podman, don't make me regret it --- modules/servers.nix | 18 ++++++++++++------ modules/servers/flame.nix | 1 - modules/servers/lidarr.nix | 1 - modules/servers/maloja.nix | 1 - modules/servers/mealie.nix | 1 - modules/servers/metube.nix | 1 - modules/servers/multi-scrobbler.nix | 3 +-- modules/servers/nextcloud.nix | 1 - modules/servers/prowlarr.nix | 1 - modules/servers/ryot.nix | 1 - 10 files changed, 13 insertions(+), 16 deletions(-) diff --git a/modules/servers.nix b/modules/servers.nix index 18dff75..6f769e9 100644 --- a/modules/servers.nix +++ b/modules/servers.nix @@ -147,13 +147,19 @@ in { vaultwarden.enable = lib.mkDefault false; firefly-iii.enable = lib.mkDefault false; }; - virtualisation.docker = lib.mkIf enableDocker { - enable = true; - enableNvidia = true; - autoPrune = { + virtualisation = { + containers.enable = true; + oci-containers.backend = "podman"; + podman = lib.mkIf enableDocker { enable = true; - flags = [ "--all" ]; - dates = "weekly"; + dockerCompat = true; + dockerSocket.enable = true; + defaultNetwork.settings.dns_enabled = true; + autoPrune = { + enable = true; + flags = [ "--all" ]; + dates = "weekly"; + }; }; }; security.acme = lib.mkIf config.services.nginx.enable { diff --git a/modules/servers/flame.nix b/modules/servers/flame.nix index c672bc2..1bd5199 100644 --- a/modules/servers/flame.nix +++ b/modules/servers/flame.nix @@ -10,7 +10,6 @@ in { config = lib.mkIf config.my.servers.flame.enable { sops.secrets.flame.sopsFile = ../../secrets/env.yaml; virtualisation.oci-containers = { - backend = "docker"; containers = { flame = { autoStart = true; diff --git a/modules/servers/lidarr.nix b/modules/servers/lidarr.nix index 70f2732..aeeaea3 100644 --- a/modules/servers/lidarr.nix +++ b/modules/servers/lidarr.nix @@ -6,7 +6,6 @@ in { options.my.servers.lidarr.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.servers.lidarr.enable { virtualisation.oci-containers = { - backend = "docker"; containers.lidarr = { autoStart = true; image = "lscr.io/linuxserver/lidarr:latest"; diff --git a/modules/servers/maloja.nix b/modules/servers/maloja.nix index 3c94837..ed29e14 100644 --- a/modules/servers/maloja.nix +++ b/modules/servers/maloja.nix @@ -7,7 +7,6 @@ in { config = lib.mkIf config.my.servers.maloja.enable { sops.secrets.maloja.sopsFile = ../../secrets/env.yaml; virtualisation.oci-containers = { - backend = "docker"; containers.maloja = { image = "krateng/maloja"; ports = [ "${toString port}:${toString port}" ]; diff --git a/modules/servers/mealie.nix b/modules/servers/mealie.nix index f8d9f3b..7ac5455 100644 --- a/modules/servers/mealie.nix +++ b/modules/servers/mealie.nix @@ -8,7 +8,6 @@ in { config = lib.mkIf config.my.servers.mealie.enable { sops.secrets.mealie.sopsFile = ../../secrets/env.yaml; virtualisation.oci-containers = { - backend = "docker"; containers.mealie = { autoStart = true; image = "ghcr.io/mealie-recipes/mealie:v1.4.0"; diff --git a/modules/servers/metube.nix b/modules/servers/metube.nix index 7a7c6ce..ad66a6a 100644 --- a/modules/servers/metube.nix +++ b/modules/servers/metube.nix @@ -4,7 +4,6 @@ in { options.my.servers.metube.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.servers.metube.enable { virtualisation.oci-containers = { - backend = "docker"; containers.metube = { image = "ghcr.io/alexta69/metube"; ports = [ "${toString port}:8081" ]; diff --git a/modules/servers/multi-scrobbler.nix b/modules/servers/multi-scrobbler.nix index e4f750b..1104bcf 100644 --- a/modules/servers/multi-scrobbler.nix +++ b/modules/servers/multi-scrobbler.nix @@ -8,7 +8,6 @@ in { config = lib.mkIf config.my.servers.multi-scrobbler.enable { sops.secrets.multi-scrobbler.sopsFile = ../../secrets/env.yaml; virtualisation.oci-containers = { - backend = "docker"; containers.multi-scrobbler = { image = "foxxmd/multi-scrobbler"; ports = [ "${toString port}:${toString port}" ]; @@ -21,7 +20,7 @@ in { DEEZER_REDIRECT_URI = "http://${config.my.miniserver-ip}:${ toString port }/deezer/callback"; - MALOJA_URL = "https://maloja.${config.my.domain}"; + MALOJA_URL = "http://maloja:42010"; WS_ENABLE = "true"; }; volumes = [ "${config.my.containerData}/multi-scrobbler:/config" ]; diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix index bdac35c..0655f1b 100644 --- a/modules/servers/nextcloud.nix +++ b/modules/servers/nextcloud.nix @@ -183,7 +183,6 @@ in { }; }; virtualisation.oci-containers = { - backend = "docker"; containers = { go-vod = lib.mkIf config.my.servers.go-vod.enable { autoStart = true; diff --git a/modules/servers/prowlarr.nix b/modules/servers/prowlarr.nix index 631fbde..66ecdef 100644 --- a/modules/servers/prowlarr.nix +++ b/modules/servers/prowlarr.nix @@ -14,7 +14,6 @@ }; }; virtualisation.oci-containers = { - backend = "docker"; containers.flaresolverr = { autoStart = true; image = "ghcr.io/flaresolverr/flaresolverr:latest"; diff --git a/modules/servers/ryot.nix b/modules/servers/ryot.nix index 876c154..517680b 100644 --- a/modules/servers/ryot.nix +++ b/modules/servers/ryot.nix @@ -8,7 +8,6 @@ in { (config.my.servers.ryot.enable && config.my.servers.postgres.enable) { sops.secrets.ryot.sopsFile = ../../secrets/env.yaml; virtualisation.oci-containers = { - backend = "docker"; containers.ryot = { image = "ghcr.io/ignisda/ryot:latest"; ports = [ "${toString port}:8000" ];