From 01b5372467faf232d59aa49b2a1e670ae5f4599a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Feb 2017 14:25:44 +0100
Subject: unstable @ 2017-02-28

---
 makefu/2configs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 45f7315b0..74d3635bd 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
           {
@@ -159,7 +159,7 @@ with import <stockholm/lib>;
     auto-optimise-store = true
   '';
 
-  security.setuidPrograms = [ "sendmail" ];
+  security.wrappers.sendmail.source = "${pkgs.exim}/bin/sendmail";
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M
-- 
cgit v1.2.3


From e495e59af040ba517843c572c4884f1434eefccb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Mar 2017 16:59:34 +0100
Subject: m 2 default: suid for sendmail

---
 makefu/2configs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 74d3635bd..bf70ebe08 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -159,7 +159,10 @@ with import <stockholm/lib>;
     auto-optimise-store = true
   '';
 
-  security.wrappers.sendmail.source = "${pkgs.exim}/bin/sendmail";
+  security.wrappers.sendmail = {
+    source = "${pkgs.exim}/bin/sendmail";
+    setuid = true;
+  };
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M
-- 
cgit v1.2.3


From ef300aeb9e2c9230ce47ff306d4f5e4b684d69f1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 22:02:47 +0100
Subject: m 2 default: timesyncd replaced ntp in defaults

---
 makefu/2configs/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index bf70ebe08..1ad7f0710 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -145,16 +145,13 @@ 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
   '';
-- 
cgit v1.2.3