Unverified Commit e8486ebc authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

freeradius: add option to compile with postgres (#265762)

parents ec567439 162f0719

nixos/modules/services/networking/freeradius.nix

+7 −3
Original line number Diff line number Diff line
@@ -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";
@@ -72,7 +74,9 @@ in 
        /*uid = config.ids.uids.radius;*/

        description = "Radius daemon user";

        isSystemUser = true;

        groups = "radius";

      };

      groups.radius = {};

    };



    systemd.services.freeradius = freeradiusService cfg;

pkgs/servers/freeradius/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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