diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-24 15:28:06 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-24 15:34:05 +1000 |
commit | 0944d77fc07414a5b69e9d8f75dae6a54faedc2b (patch) | |
tree | 2c6030a6d414949d4fbcd35302c6cb41d1aa96bb /nixos/modules/virtualisation/containers.nix | |
parent | 5e6adf78e9644e24ca494c3ba64400e5eea5bd1d (diff) | |
download | nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.tar nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.tar.gz nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.tar.bz2 nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.tar.lz nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.tar.xz nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.tar.zst nixpkgs-0944d77fc07414a5b69e9d8f75dae6a54faedc2b.zip |
nixos/containers: move libpod to nixos/podman
Diffstat (limited to 'nixos/modules/virtualisation/containers.nix')
-rw-r--r-- | nixos/modules/virtualisation/containers.nix | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e6127e28486..7d184575640 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -30,7 +30,7 @@ in type = types.bool; default = false; description = '' - This option enables the common libpod container configuration module. + This option enables the common /etc/containers configuration module. ''; }; @@ -89,35 +89,10 @@ in ''; }; - libpod = mkOption { - default = {}; - description = "Libpod configuration"; - type = types.submodule { - options = { - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the libpod.conf - configuration file - ''; - - }; - }; - }; - }; - }; config = lib.mkIf cfg.enable { - environment.etc."containers/libpod.conf".text = '' - cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - cni_config_dir = "/etc/cni/net.d/" - - '' + cfg.libpod.extraConfig; - environment.etc."containers/registries.conf".source = toTOML "registries.conf" { registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; }; |