From 89ffd389ecfa692ca2df735c92a3f2e95e3b9010 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Mon, 6 Nov 2023 00:54:23 +0000 Subject: [PATCH 1/3] freeradius: add option to compile with postgres --- pkgs/servers/freeradius/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 5be808d6b483..c84640869021 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -12,6 +12,7 @@ , withLdap ? true, openldap , withMemcached ? false, libmemcached , withMysql ? false, libmysqlclient +, withPostgresql ? false, postgresql , withPcap ? true, libpcap , withRedis ? false, hiredis , withRest ? false, curl @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional withLdap openldap ++ lib.optional withMemcached libmemcached ++ lib.optional withMysql libmysqlclient + ++ lib.optional withPostgresql postgresql ++ lib.optional withPcap libpcap ++ lib.optional withRedis hiredis ++ lib.optional withRest curl From d0481239c18cf4f37db81d767d69454e04b1da52 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Mon, 6 Nov 2023 00:57:25 +0000 Subject: [PATCH 2/3] nixos/freeradius: add option to override package --- nixos/modules/services/networking/freeradius.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 39a137aa541c..67770f2027e9 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -10,14 +10,14 @@ let after = ["network.target"]; wants = ["network.target"]; preStart = '' - ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout + ${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout ''; serviceConfig = { - ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + + ExecStart = "${cfg.package}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + lib.optionalString cfg.debug " -xx"; ExecReload = [ - "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout" + "${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout" "${pkgs.coreutils}/bin/kill -HUP $MAINPID" ]; User = "radius"; @@ -32,6 +32,8 @@ let freeradiusConfig = { enable = lib.mkEnableOption "the freeradius server"; + package = lib.mkPackageOption pkgs "freeradius" { }; + configDir = lib.mkOption { type = lib.types.path; default = "/etc/raddb"; From 162f0719e9411506249ed2fa20f4d391f94789de Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Mon, 6 Nov 2023 01:01:27 +0000 Subject: [PATCH 3/3] nixos/freeradius: fix radius group A group must be selected since it no longer defaults to nogroup --- nixos/modules/services/networking/freeradius.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 67770f2027e9..19e5b0af1c9d 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -74,7 +74,9 @@ in /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; isSystemUser = true; + groups = "radius"; }; + groups.radius = {}; }; systemd.services.freeradius = freeradiusService cfg;