From 65933c9eb94c185430dfbebd57cf4db65e9ae9f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 20 Nov 2024 19:59:02 +0100 Subject: [PATCH] nixos/libreswan: use `environment.etc."ipsec.secrets".text` This is to ensure compatibility with the networkmanager module, which uses the `text` option. (cherry picked from commit b294762bb9a992388a7cb6eecbebcb5bf73df87c) --- nixos/modules/services/networking/libreswan.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index a66ff3065224..04f565a2bf8f 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -125,7 +125,9 @@ in # Install configuration files environment.etc = { - "ipsec.secrets".source = "${pkgs.libreswan}/etc/ipsec.secrets"; + "ipsec.secrets".text = '' + include ${pkgs.libreswan}/etc/ipsec.secrets + ''; "ipsec.conf".source = "${pkgs.libreswan}/etc/ipsec.conf"; "ipsec.d/01-nixos.conf".source = configFile; } // policyFiles;