summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/exim.nix12
-rw-r--r--krebs/3modules/os-release.nix7
2 files changed, 8 insertions, 11 deletions
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 = [
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