Unverified Commit 6c4182b0 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #325957 from mibmo/module/clamav/package-option 

nixos/clamav: add package option
parents 97500c09 8eac9663

nixos/modules/services/security/clamav.nix

+5 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ let 
  stateDir = "/var/lib/clamav";

  clamavGroup = clamavUser;

  cfg = config.services.clamav;

  pkg = pkgs.clamav;



  toKeyValue = generators.toKeyValue {

    mkKeyValue = generators.mkKeyValueDefault { } " ";
@@ -27,6 +26,7 @@ in 


  options = {

    services.clamav = {

      package = mkPackageOption pkgs "clamav" { };

      daemon = {

        enable = mkEnableOption "ClamAV clamd daemon";
@@ -125,7 +125,7 @@ in 
  };



  config = mkIf (cfg.updater.enable || cfg.daemon.enable) {

    environment.systemPackages = [ pkg ];

    environment.systemPackages = [ cfg.package ];



    users.users.${clamavUser} = {

      uid = config.ids.uids.clamav;
@@ -172,7 +172,7 @@ in 
      restartTriggers = [ clamdConfigFile ];



      serviceConfig = {

        ExecStart = "${pkg}/bin/clamd";

        ExecStart = "${cfg.package}/bin/clamd";

        ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";

        User = clamavUser;

        Group = clamavGroup;
@@ -201,7 +201,7 @@ in 


      serviceConfig = {

        Type = "oneshot";

        ExecStart = "${pkg}/bin/freshclam";

        ExecStart = "${cfg.package}/bin/freshclam";

        SuccessExitStatus = "1"; # if databases are up to date

        StateDirectory = "clamav";

        User = clamavUser;
@@ -274,7 +274,7 @@ in 


      serviceConfig = {

        Type = "oneshot";

        ExecStart = "${pkg}/bin/clamdscan --multiscan --fdpass --infected --allmatch ${lib.concatStringsSep " " cfg.scanner.scanDirectories}";

        ExecStart = "${cfg.package}/bin/clamdscan --multiscan --fdpass --infected --allmatch ${lib.concatStringsSep " " cfg.scanner.scanDirectories}";

      };

    };

  };