diff options
| author | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
| commit | a215010f30eafe2c193f34b8a8c4025b2897f583 (patch) | |
| tree | 6d4ef7825b6ffc6701e9d10d3478f31f2420214c | |
| parent | c8718ceb9f6d5fa4d01bf04fdfa7e775980b143c (diff) | |
| parent | 2c331bc91233628a3a4f683f0fc6a03928cd149a (diff) | |
Merge remote-tracking branch 'prism/master'
| -rw-r--r-- | shared/2configs/default.nix | 4 | ||||
| -rw-r--r-- | shared/2configs/graphite.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix index 31f786d..f5377db 100644 --- a/shared/2configs/default.nix +++ b/shared/2configs/default.nix @@ -11,7 +11,7 @@ with config.krebs.lib; nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "9cb194cfa449c43f63185a25c8d10307aea3b358"; # nixos-16.03 @ 2016-08-05 + ref = "b8ede35d2efa96490857c22c751e75d600bea44f"; # nixos-16.09 @ 2016-10-19 }; secrets.file = if getEnv "dummy_secrets" == "true" @@ -28,7 +28,7 @@ with config.krebs.lib; "http://cache.nixos.org" "http://hydra.nixos.org" ]; - nix.useChroot = true; + nix.useSandbox = true; nixpkgs.config.packageOverrides = pkgs: { nano = pkgs.vim; diff --git a/shared/2configs/graphite.nix b/shared/2configs/graphite.nix index 37c6b09..bfa2b29 100644 --- a/shared/2configs/graphite.nix +++ b/shared/2configs/graphite.nix @@ -12,7 +12,7 @@ with config.krebs.lib; services.graphite = { web = { enable = true; - host = "0.0.0.0"; + listenAddress = "0.0.0.0"; }; carbon = { enableCache = true; |