Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master' into HEAD

Browse Source
This commit is contained in:
lassulus 2017-06-20 16:09:45 +02:00
commit b8ab99649a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefu/2configs/default.nix
View File

@ -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
{

1
makefu/2configs/deployment/dirctator.nix
View File

@ -10,6 +10,7 @@ let
'';
in {
services.logstash = {
package = pkgs.logstash5;
enable = true;
inputConfig = ''
irc {