mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Revert "nixos/containers: add storage.conf"
This file requires some defaults to be set otherwise podman, etc errors.
It also broke the podman nixos tests.
This reverts commit 7a4de9a983
.
This commit is contained in:
parent
631d2e55df
commit
3cf17240f0
|
@ -65,12 +65,6 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
storage.settings = mkOption {
|
|
||||||
type = toml.type;
|
|
||||||
default = {};
|
|
||||||
description = "storage.conf configuration";
|
|
||||||
};
|
|
||||||
|
|
||||||
registries = {
|
registries = {
|
||||||
search = mkOption {
|
search = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
|
@ -135,9 +129,6 @@ in
|
||||||
environment.etc."containers/containers.conf".source =
|
environment.etc."containers/containers.conf".source =
|
||||||
toml.generate "containers.conf" cfg.containersConf.settings;
|
toml.generate "containers.conf" cfg.containersConf.settings;
|
||||||
|
|
||||||
environment.etc."containers/storage.conf".source =
|
|
||||||
toml.generate "storage.conf" cfg.storage.settings;
|
|
||||||
|
|
||||||
environment.etc."containers/registries.conf".source = toml.generate "registries.conf" {
|
environment.etc."containers/registries.conf".source = toml.generate "registries.conf" {
|
||||||
registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries;
|
registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue