diff options
author | Martin Sturm <mstrm@openmailbox.org> | 2015-09-29 20:08:53 +0200 |
---|---|---|
committer | Martin Sturm <mstrm@openmailbox.org> | 2016-03-04 02:26:44 +0100 |
commit | 507ad9a4f92df8c324ee23d49a817b12968c77ca (patch) | |
tree | db8102a3b88f3a1ab7c7ec9a0e29117965cb7fb8 /nixos | |
parent | 4bea06636aa00560f3348e560e0138d5322c4e7e (diff) | |
download | nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.tar nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.tar.gz nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.tar.bz2 nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.tar.lz nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.tar.xz nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.tar.zst nixlib-507ad9a4f92df8c324ee23d49a817b12968c77ca.zip |
clamav: Use freshclam.conf defined by clamav-updater module if enabled
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/security/clamav.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 548aee29b266..e4e5c1253b77 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -16,6 +16,7 @@ let ${cfg.daemon.extraConfig} ''; + pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; }; in { options = { @@ -54,7 +55,7 @@ in }; config = mkIf cfg.updater.enable or cfg.daemon.enable { - environment.systemPackages = [ pkgs.clamav ]; + environment.systemPackages = [ pkg ]; users.extraUsers = singleton { name = clamavUser; uid = config.ids.uids.clamav; @@ -76,7 +77,7 @@ in systemd.services.clamd = mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; - path = [ pkgs.clamav ]; + path = [ pkg ]; after = [ "network.target" "freshclam.service" ]; requires = [ "freshclam.service" ]; wantedBy = [ "multi-user.target" ]; @@ -87,7 +88,7 @@ in chown ${clamavUser}:${clamavGroup} ${runDir} ''; serviceConfig = { - ExecStart = "${pkgs.clamav}/bin/clamd --config-file=${clamdConfigFile}"; + ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}"; Type = "forking"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; @@ -100,13 +101,13 @@ in description = "ClamAV updater (freshclam)"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.clamav ]; + path = [ pkg ]; preStart = '' mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} ''; serviceConfig = { - ExecStart = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; + ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; RestartSec = "10s"; |