summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-20 16:09:45 +0200
committerlassulus <lass@lassul.us>2017-06-20 16:09:45 +0200
commitb8ab99649ad7bcfdb329f355e70337a533061b89 (patch)
tree8b35f9b6805b90bc91316fba942eca209be878c7
parentdc5661c3adabd9460b4bb10bb8590e44970cbc7d (diff)
parent8a150bcd44d5d32d5c36be7a3cba885d0d1d8b59 (diff)
Merge remote-tracking branch 'gum/master' into HEAD
-rw-r--r--makefu/2configs/default.nix2
-rw-r--r--makefu/2configs/deployment/dirctator.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 8038142ac..bcd998826 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
- ref = "f6a2c46"; # unstable @ 2017-06-18 + graceful requests2
+ ref = "7a7c39c"; # unstable @ 2017-05-09 + graceful requests2 + logstash5
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{
diff --git a/makefu/2configs/deployment/dirctator.nix b/makefu/2configs/deployment/dirctator.nix
index 14d5918cb..b8e61955d 100644
--- a/makefu/2configs/deployment/dirctator.nix
+++ b/makefu/2configs/deployment/dirctator.nix
@@ -10,6 +10,7 @@ let
'';
in {
services.logstash = {
+ package = pkgs.logstash5;
enable = true;
inputConfig = ''
irc {