diff --git a/modules/services/download-pod.nix b/modules/services/download-pod.nix index 0ec5dc5..8b82a1f 100644 --- a/modules/services/download-pod.nix +++ b/modules/services/download-pod.nix @@ -61,7 +61,7 @@ let }; # Pod Definition - download = { + podDefinition = { name = "download"; ports = [ "7878:7878" # : Radarr @@ -104,12 +104,12 @@ in config = lib.mkIf cfg.enable { my.virtualisation.podmanPods = { - inherit download; + inherit podDefinition; }; virtualisation.oci-containers.containers = let - pod = config.helpers.processContainers download; + pod = config.helpers.processContainers podDefinition; in pod.containers; diff --git a/modules/virtualisation/podman-pod.nix b/modules/virtualisation/podman-pod.nix index b12689a..1d1568a 100644 --- a/modules/virtualisation/podman-pod.nix +++ b/modules/virtualisation/podman-pod.nix @@ -42,15 +42,15 @@ let }; createPodScript = - name: podDef: + podDef: let podDefinitionString = builtins.toJSON { inherit (podDef) ports; }; in - pkgs.writeScript "manage-pod-${name}.sh" '' + pkgs.writeScript "manage-pod-${podDef.name}.sh" '' #! /bin/sh set -e - POD_NAME="${name}" + POD_NAME="${podDef.name}" POD_DEFINITION="${podDefinitionString}" create_pod() { @@ -108,11 +108,11 @@ in podServices = mapAttrs' ( name: podDef: - nameValuePair "podman-pod-${name}" { - description = "Manage Podman pod: ${name}"; + nameValuePair "podman-pod-${podDef.name}" { + description = "Manage Podman pod: ${podDef.name}"; serviceConfig = { Type = "oneshot"; - ExecStart = "${createPodScript name podDef}"; + ExecStart = "${createPodScript podDef}"; }; path = [ pkgs.jq