summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-11-15 04:40:33 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-11-15 04:47:14 +0100
commit9e1e3b288062abf37847307adeee17f3c8dddc42 (patch)
treee6daf4a90e37c7f860c8040b975f299176e75262 /nixos/modules/rename.nix
parent02e9c88d778b06909d4ef5a2e7e417aaeecb89a7 (diff)
downloadnixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.tar
nixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.tar.gz
nixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.tar.bz2
nixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.tar.lz
nixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.tar.xz
nixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.tar.zst
nixpkgs-9e1e3b288062abf37847307adeee17f3c8dddc42.zip
clamav service: refactor
* Sync systemd units with upstream. Upstream uses SIGUSR2 instead of SIGHUP
  to reload the clamd service.

* Convert freshclam service to a oneshot service activated by a systemd timer.
  This way we can make clamd wait for freshclam to finish fetching the virus
  database before failing to start if the database doesn't exist yet.

* Fixes console tools to work as expected as they require hardcoded config
  file locations.
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 44e07f4618d..0d2e0f981db 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -30,6 +30,8 @@ with lib;
     (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
     (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")
 
+    (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
+
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
     (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])