diff options
| author | Corbin <cds@corbinsimpson.com> | 2016-08-17 21:14:31 -0700 |
|---|---|---|
| committer | Corbin <cds@corbinsimpson.com> | 2016-08-17 21:14:31 -0700 |
| commit | 09e75a4c29eb205ada853137a0b531dca195c5f1 (patch) | |
| tree | a0341bbfe4c7c0602b43c47297d614352afee87e /nixos/modules/services/monitoring | |
| parent | 2942895d552c30033d902553566a06334264d3e2 (diff) | |
| download | nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.tar nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.tar.gz nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.tar.bz2 nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.tar.lz nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.tar.xz nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.tar.zst nixlib-09e75a4c29eb205ada853137a0b531dca195c5f1.zip | |
services/graphite: Fix paths to some Python packages.
Unbreaks some private Graphite deployments.
Diffstat (limited to 'nixos/modules/services/monitoring')
| -rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index e50728aff8f8..8ef684932ac6 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -390,7 +390,7 @@ in { after = [ "network-interfaces.target" ]; environment = carbonEnv; serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; @@ -413,7 +413,7 @@ in { after = [ "network-interfaces.target" ]; environment = carbonEnv; serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; @@ -429,7 +429,7 @@ in { after = [ "network-interfaces.target" ]; environment = carbonEnv; serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; @@ -461,7 +461,7 @@ in { 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}"; + in "${penvPack}/opt/graphite/webapp:${penvPack}:${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}"; DJANGO_SETTINGS_MODULE = "graphite.settings"; GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; |