summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-10-20 20:22:29 +0200
committertv <tv@krebsco.de>2016-10-20 20:22:29 +0200
commit9329c1e47ddda0653d7e9824a01632ce3766e8f0 (patch)
tree2bfb70737a757d0bd61ca0aa895c77d740b21e73 /shared
parent844d347ce7cf0b7646e9ecba3fbdc0b90e608501 (diff)
parent0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared')
-rw-r--r--shared/2configs/default.nix4
-rw-r--r--shared/2configs/graphite.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix
index 31f786d1d..f5377db94 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 37c6b09fd..bfa2b2966 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;