From e5f3827fc84ba1c769c1422d92fa93ebcb0fc5d1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 18 Mar 2018 17:31:59 +0100
Subject: os-release: follow renamed modules

---
 krebs/3modules/os-release.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/os-release.nix b/krebs/3modules/os-release.nix
index 8f71a357f..5fbfe6614 100644
--- a/krebs/3modules/os-release.nix
+++ b/krebs/3modules/os-release.nix
@@ -1,8 +1,11 @@
 { config, ... }:
 with import <stockholm/lib>;
 let
-  nixos-version-id = "${config.system.nixosVersion}";
-  nixos-version = "${nixos-version-id} (${config.system.nixosCodeName})";
+  nixos-version-id = if (hasAttr "nixos" config.system) then
+    "${config.system.nixos.version}" else "${config.system.nixosVersion}";
+  nixos-codeName = if (hasAttr "nixos" config.system) then
+    "${config.system.nixos.codeName}" else "${config.system.nixosCodeName}";
+  nixos-version = "${nixos-version-id} (${nixos-codeName})";
   nixos-pretty-name = "NixOS ${nixos-version}";
 
   stockholm-version-id = let
-- 
cgit v1.2.3


From d810727b985bbdce57ae2de515111949c141c3bd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 24 Mar 2018 12:19:52 +0100
Subject: exim: krebs.setuid -> security.wrappers

---
 krebs/3modules/exim.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix
index cfcbbc438..274a943b1 100644
--- a/krebs/3modules/exim.nix
+++ b/krebs/3modules/exim.nix
@@ -50,15 +50,9 @@ in {
       '';
       systemPackages = [ pkgs.exim ];
     };
-    krebs.setuid = {
-      exim = {
-        filename = "${pkgs.exim}/bin/exim";
-        mode = "4111";
-      };
-      sendmail = {
-        filename = "${pkgs.exim}/bin/exim";
-        mode = "4111";
-      };
+    security.wrappers = {
+      exim.source = "${pkgs.exim}/bin/exim";
+      sendmail.source = "${pkgs.exim}/bin/exim";
     };
     systemd.services.exim = {
       restartTriggers = [
-- 
cgit v1.2.3


From 7e62c44607f193d3c9740f7c56df976b0db3c417 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 27 Mar 2018 21:35:27 +0200
Subject: Revert "exim: krebs.setuid -> security.wrappers"

This reverts commit d810727b985bbdce57ae2de515111949c141c3bd.
---
 krebs/3modules/exim.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix
index 274a943b1..cfcbbc438 100644
--- a/krebs/3modules/exim.nix
+++ b/krebs/3modules/exim.nix
@@ -50,9 +50,15 @@ in {
       '';
       systemPackages = [ pkgs.exim ];
     };
-    security.wrappers = {
-      exim.source = "${pkgs.exim}/bin/exim";
-      sendmail.source = "${pkgs.exim}/bin/exim";
+    krebs.setuid = {
+      exim = {
+        filename = "${pkgs.exim}/bin/exim";
+        mode = "4111";
+      };
+      sendmail = {
+        filename = "${pkgs.exim}/bin/exim";
+        mode = "4111";
+      };
     };
     systemd.services.exim = {
       restartTriggers = [
-- 
cgit v1.2.3