diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-06 15:32:17 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:48 +0200 |
commit | 99e4371526a9cc48f1f10e2e9f144e3e839ad709 (patch) | |
tree | 1cc37b42aae06673023c0e7c4168dda47d12f182 /nixos/modules/services | |
parent | e71c9cfaa23ddaffc03667e2020cf2ee6bd71fb7 (diff) | |
download | nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.gz nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.bz2 nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.lz nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.xz nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.zst nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.zip |
curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
Diffstat (limited to 'nixos/modules/services')
6 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 95d2aecfac7d..31e585f211fe 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -117,11 +117,11 @@ in { ''; postStart = '' - until ${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port} ; do + until ${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port} ; do sleep 10 done while true ; do - index=`${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port}` + index=`${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port}` if [[ !("$index" =~ 'Please wait while Jenkins is restarting' || "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then exit 0 diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 08963f7aab7f..4be0428caa33 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -225,7 +225,7 @@ in if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi ''; postStart = mkBefore '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do sleep 1; done ''; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index f472e530a70b..d0431e546e49 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -65,7 +65,7 @@ in { }; postStart = '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do sleep 1; done ''; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index b6cf397f35c0..031558a373c9 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -71,7 +71,7 @@ in { after = [ "network.target" "docker.service" "influxdb.service" ]; postStart = mkBefore '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do sleep 1; done ''; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 7ee78f01d497..5e974555aada 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -8,7 +8,7 @@ let homeDir = "/var/lib/i2pd"; - extip = "EXTIP=\$(${pkgs.curl}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; + extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; i2pSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 3436bd01d848..968739877074 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -142,7 +142,7 @@ in { ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins ''; postStart = mkBefore '' - until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do sleep 1 done ''; |