diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2018-06-05 11:26:02 +0200 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2018-06-05 11:26:02 +0200 |
commit | 5f1ad293407ee82998a62ce93130f93ba9249f89 (patch) | |
tree | 888891b64f1654a6e1ea6916a16a7a7deac45a41 /nixos/modules/services/misc | |
parent | 1d1a4bfb392c7d5d2ca5e0ccd66624b7c9f3aa7e (diff) | |
download | nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.tar nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.tar.gz nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.tar.bz2 nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.tar.lz nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.tar.xz nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.tar.zst nixlib-5f1ad293407ee82998a62ce93130f93ba9249f89.zip |
nixos/docker-registry: allow nested config options
for example: services.dockerRegistry = { enable = true; extraConfig = { http = { host = "https://${config.networking.hostName}:5000"; tls = { certificate = "${registry-tls}/snakeoil.pem"; key = "${registry-tls}/snakeoil.key"; }; }; }; };
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r-- | nixos/modules/services/misc/docker-registry.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 45931cb42b54..fe0a8e58de3d 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -42,7 +42,7 @@ let }; }; - configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig)); + configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig)); in { options.services.dockerRegistry = { @@ -91,7 +91,7 @@ in { Docker extra registry configuration via environment variables. ''; default = {}; - type = types.attrsOf types.str; + type = types.attrs; }; enableGarbageCollect = mkEnableOption "garbage collect"; |