diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2017-05-04 09:40:51 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2017-05-04 09:47:21 +0000 |
| commit | a9f054c8348bf8cd7630cd99def2fd86d22c78bd (patch) | |
| tree | 4118e7a8ab53f982ef746fb9808b9561157fad88 /pkgs/tools/networking/dd-agent | |
| parent | f2771375222e399d3ec628ebd59e2dac501d7e4b (diff) | |
dd-agent: Add default config files of dd-agent and auto_conf dir
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.
Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d
In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.
This change implements similar functionality as PR #25288, without
breaking backwards compatibility.
(cherry picked from commit 77c85b0ecbc1070d7adff31b339bede92e4193fa)
Diffstat (limited to 'pkgs/tools/networking/dd-agent')
| -rw-r--r-- | pkgs/tools/networking/dd-agent/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 10b7b47b3f4c..e9a70b17130c 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -64,6 +64,9 @@ in stdenv.mkDerivation rec { ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd ln -s $out/agent/ddagent.py $out/bin/dd-forwarder + # Move out default conf.d so that /etc/dd-agent/conf.d is used + mv $out/agent/conf.d $out/agent/conf.d-system + cat > $out/bin/dd-jmxfetch <<EOF #!/usr/bin/env bash exec ${python}/bin/python $out/agent/jmxfetch.py $@ |