Unverified Commit 03bf44b9 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

nixos/freenet: refactor, migrate to runTest (#391886)

parents 6846ab20 0604d0ae

nixos/modules/services/networking/freenet.nix

+10 −24
Original line number Diff line number Diff line 
# NixOS module for Freenet daemon

{

  config,

  lib,

  pkgs,

  ...

}:

let



let

  cfg = config.services.freenet;

  varDir = "/var/lib/freenet";



in



{



  ### configuration



  options = {



    services.freenet = {



      enable = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = "Enable the Freenet daemon";

      };

      enable = lib.mkEnableOption "Freenet daemon";



      nice = lib.mkOption {

        type = lib.types.int;

        default = 10;

        description = "Set the nice level for the Freenet daemon";

      };



    };



  };



  ### implementation



  config = lib.mkIf cfg.enable {



    systemd.services.freenet = {

      description = "Freenet daemon";

      after = [ "network.target" ];

      wantedBy = [ "multi-user.target" ];

      serviceConfig.ExecStart = "${pkgs.freenet}/bin/freenet";

      serviceConfig.User = "freenet";

      serviceConfig.UMask = "0007";

      serviceConfig.WorkingDirectory = varDir;

      serviceConfig.Nice = cfg.nice;

      serviceConfig = {

        ExecStart = lib.getExe pkgs.freenet;

        User = "freenet";

        UMask = "0007";

        WorkingDirectory = varDir;

        Nice = cfg.nice;

      };

    };



    users.users.freenet = {
@@ -62,4 +47,5 @@ in 
    users.groups.freenet.gid = config.ids.gids.freenet;

  };



  meta.maintainers = with lib.maintainers; [ nagy ];

}

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ in 
    inherit runTest;

    forgejoPackage = pkgs.forgejo-lts;

  };

  freenet = handleTest ./freenet.nix { };

  freenet = runTest ./freenet.nix;

  freeswitch = handleTest ./freeswitch.nix { };

  freetube = discoverTests (import ./freetube.nix);

  freshrss = handleTest ./freshrss { };

nixos/tests/freenet.nix

+18 −21
Original line number Diff line number Diff line 
import ./make-test-python.nix (

  { pkgs, ... }:

{ lib, ... }:



{

  name = "freenet";

    meta = with pkgs.lib.maintainers; {

      maintainers = [ nagy ];

  meta = {

    maintainers = with lib.maintainers; [ nagy ];

  };



  nodes = {

      machine =

        { ... }:

        {

    machine = {

      services.freenet.enable = true;

    };

  };
@@ -21,4 +19,3 @@ import ./make-test-python.nix ( 
    machine.succeed("systemctl stop freenet")

  '';

}
 
)