public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/docker-registry: rename 'host' to 'listenAddress'

Browse Source 
More descriptive option name.
This commit is contained in:
Bjørn Forsman 2015-12-24 00:06:40 +01:00
parent 79367816a9
commit e0b0b9723c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

@ -14,6 +14,7 @@ with lib;
(mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
(mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
(mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])

6
nixos/modules/services/misc/docker-registry.nix
View File

@ -15,7 +15,7 @@ in {
type = types.bool; type = types.bool;
}; };
host = mkOption { listenAddress = mkOption {
description = "Docker registry host or ip to bind to."; description = "Docker registry host or ip to bind to.";
default = "127.0.0.1"; default = "127.0.0.1";
type = types.str; type = types.str;
@ -50,7 +50,7 @@ in {
after = [ "network.target" ]; after = [ "network.target" ];
environment = { environment = {
REGISTRY_HOST = cfg.host; REGISTRY_HOST = cfg.listenAddress;
REGISTRY_PORT = toString cfg.port; REGISTRY_PORT = toString cfg.port;
GUNICORN_OPTS = "[--preload]"; # see https://github.com/docker/docker-registry#sqlalchemy GUNICORN_OPTS = "[--preload]"; # see https://github.com/docker/docker-registry#sqlalchemy
STORAGE_PATH = cfg.storagePath; STORAGE_PATH = cfg.storagePath;
@ -65,7 +65,7 @@ in {
}; };
postStart = '' postStart = ''
until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/'; do
sleep 1; sleep 1;
done done
''; '';