diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-10 01:22:16 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-10 01:22:16 +0200 |
commit | 9f16e659f129dd8acab7d086ef9822673a01ba06 (patch) | |
tree | e457a3aa743bf31f67d09ee9569bbda3cd5bf152 /modules/private/monitoring | |
parent | a071d8a6af7b8130047b3997c34b15f71089a4e5 (diff) | |
download | Nix-9f16e659f129dd8acab7d086ef9822673a01ba06.tar.gz Nix-9f16e659f129dd8acab7d086ef9822673a01ba06.tar.zst Nix-9f16e659f129dd8acab7d086ef9822673a01ba06.zip |
Stop using overlays in the middle of modules
Diffstat (limited to 'modules/private/monitoring')
-rw-r--r-- | modules/private/monitoring/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix index 8b45d47..0586567 100644 --- a/modules/private/monitoring/default.nix +++ b/modules/private/monitoring/default.nix | |||
@@ -11,6 +11,11 @@ let | |||
11 | pkgs.mailutils | 11 | pkgs.mailutils |
12 | ]} | 12 | ]} |
13 | ''; | 13 | ''; |
14 | postgresqlBinary = if config.myServices.databasesReplication.postgresql.enable | ||
15 | then config.myServices.databasesReplication.postgresql.mainPackage | ||
16 | else if config.myServices.databases.enable | ||
17 | then config.myServices.databases.postgresql.package | ||
18 | else pkgs.postgresql; | ||
14 | myplugins = pkgs.runCommand "buildplugins" { | 19 | myplugins = pkgs.runCommand "buildplugins" { |
15 | buildInputs = [ pkgs.makeWrapper pkgs.perl ]; | 20 | buildInputs = [ pkgs.makeWrapper pkgs.perl ]; |
16 | } '' | 21 | } '' |
@@ -28,7 +33,7 @@ let | |||
28 | pkgs.gnugrep pkgs.gawk pkgs.procps-ng | 33 | pkgs.gnugrep pkgs.gawk pkgs.procps-ng |
29 | ]} | 34 | ]} |
30 | wrapProgram $out/check_postgres_replication --prefix PATH : ${lib.makeBinPath [ | 35 | wrapProgram $out/check_postgres_replication --prefix PATH : ${lib.makeBinPath [ |
31 | pkgs.postgresql | 36 | postgresqlBinary |
32 | ]} | 37 | ]} |
33 | wrapProgram $out/check_redis_replication --prefix PATH : ${lib.makeBinPath [ | 38 | wrapProgram $out/check_redis_replication --prefix PATH : ${lib.makeBinPath [ |
34 | pkgs.gnugrep pkgs.coreutils pkgs.redis | 39 | pkgs.gnugrep pkgs.coreutils pkgs.redis |