diff options
| author | tv <tv@krebsco.de> | 2017-03-05 17:01:57 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-03-05 17:01:57 +0100 |
| commit | 23a79b8fb02b3bebfb377f2b236432ff9a73343a (patch) | |
| tree | 494bcb3bb57b397bab756aebe86e85dbd5a2a2fd /makefu/2configs/default.nix | |
| parent | fd6c056a720544319f02cf02b64fa8dd2b657aa8 (diff) | |
| parent | cb48e9371a337d23e1f3f09b5d024ee60451d9d2 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/default.nix')
| -rw-r--r-- | makefu/2configs/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 45f7315b0..1ad7f0710 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 = "f66d782"; # unstable @ 2017-02-04 + ref = "53a2baa"; # unstable @ 2017-02-28 in { nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then { @@ -145,21 +145,21 @@ with import <stockholm/lib>; tinc = pkgs.tinc_pre; }; - services.cron.enable = false; - services.nscd.enable = false; - services.ntp.enable = false; - services.timesyncd.enable = true; - services.ntp.servers = [ + networking.timeServers = [ "pool.ntp.org" "time.windows.com" "time.apple.com" "time.nist.gov" ]; + nix.extraOptions = '' auto-optimise-store = true ''; - security.setuidPrograms = [ "sendmail" ]; + security.wrappers.sendmail = { + source = "${pkgs.exim}/bin/sendmail"; + setuid = true; + }; services.journald.extraConfig = '' SystemMaxUse=1G RuntimeMaxUse=128M |