diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-10-31 15:49:59 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-10-31 15:49:59 +0100 |
| commit | 04b2460eb65c64705df0de0ce33dde6ba524a216 (patch) | |
| tree | 0a8b9f4262a01316d8f5da54550430da2367f420 /nixos/modules/services/monitoring/graphite.nix | |
| parent | fe9cefa7e4ed4da1a0d1d9777bf0f7145fff22e3 (diff) | |
| download | nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.tar nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.tar.gz nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.tar.bz2 nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.tar.lz nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.tar.xz nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.tar.zst nixpkgs-04b2460eb65c64705df0de0ce33dde6ba524a216.zip | |
graphite: fix the graphiteApi service
Diffstat (limited to 'nixos/modules/services/monitoring/graphite.nix')
| -rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 01b4aca9173..645dfeab019 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -22,8 +22,8 @@ let ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' - time_zone: ${config.time.timeZone} search_index: ${dataDir}/index + ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} @@ -536,7 +536,7 @@ in { environment = { PYTHONPATH = let aenv = pkgs.python.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders; + extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders; }; in "${aenv}/${pkgs.python.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; |