diff options
author | Robin Gloster <mail@glob.in> | 2016-03-12 13:48:34 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-12 13:48:34 +0100 |
commit | 11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3 (patch) | |
tree | 8a1f654eb7e9b088a2326baca5fe05243af29e25 | |
parent | 2a288ad435be06b68ff90bc768bc512b9094d29a (diff) | |
parent | 626bfce3b867b4bb17d48887a7c1b53ce1b1e8cd (diff) | |
download | nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.tar nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.tar.gz nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.tar.bz2 nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.tar.lz nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.tar.xz nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.tar.zst nixlib-11b99a4ef6491b1894717f2ae3eb2f240b0ed4e3.zip |
Merge pull request #13854 from makefu/graphite-web-fix
graphite: fix carbonCache graphiteWeb graphiteApi
-rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 976fd253a7cd..7104a5796f76 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -51,7 +51,13 @@ let ''; carbonEnv = { - PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages"; + PYTHONPATH = let + cenv = pkgs.python.buildEnv.override { + extraLibs = [ pkgs.python27Packages.carbon ]; + }; + cenvPack = "${cenv}/${pkgs.python.sitePackages}"; + # opt/graphite/lib contains twisted.plugins.carbon-cache + in "${cenvPack}/opt/graphite/lib:${cenvPack}"; GRAPHITE_ROOT = dataDir; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; @@ -445,10 +451,21 @@ in { after = [ "network-interfaces.target" ]; path = [ pkgs.perl ]; environment = { - PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages"; + PYTHONPATH = let + penv = pkgs.python.buildEnv.override { + extraLibs = [ + pkgs.python27Packages.graphite_web + pkgs.python27Packages.pysqlite + ]; + }; + penvPack = "${penv}/${pkgs.python.sitePackages}"; + # opt/graphite/webapp contains graphite/settings.py + # explicitly adding pycairo in path because it cannot be imported via buildEnv + in "${penvPack}/opt/graphite/webapp:${penvPack}:${pkgs.pycairo}/${pkgs.python.sitePackages}"; DJANGO_SETTINGS_MODULE = "graphite.settings"; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; + LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; }; serviceConfig = { ExecStart = '' @@ -486,9 +503,11 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = { - PYTHONPATH = - "${cfg.api.package}/lib/python2.7/site-packages:" + - concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; + PYTHONPATH = let + aenv = pkgs.python.buildEnv.override { + extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders; + }; + in "${aenv}/${pkgs.python.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; }; |