OP#785 revert

.vscode/settings.json

@@ -33,6 +33,7 @@
         "logsyslog",
         "logtime",
         "logverbose",
+        "MAINPID",
         "multiscan",
         "mypass",
         "myproxy",

README.md

@@ -34,7 +34,7 @@
 - manage cronjob settings via parameters
 - run cron job to scan the file system (by default starting at root, configurable) via clamdscan
 - set ConcurrentDatabaseReload option `yes`/`no` to optimize RAM consumption. defaults to `no`
-- manage services
+- manage `freshclam` and `clamd` services
 
 ## Dependencies
 

manifests/params.pp

@@ -40,6 +40,12 @@
 #   database reloads. This is useful when you have multiple clamd instances
 #   running on the same machine. If you have only one clamd instance, this
 #   should be set to 'no'.
+# @param [String] cv_clamd_max_mem maximum memory usage for clamd. 
+# @param [String] cv_clamd_cpu_quota maximum CPU usage for clamd.
+# @param [String] cv_nice_value nice value for clamd. This is a number between
+#   -20 and 19. The lower the number, the higher the priority. The default is 
+#   19, which is the lowest priority.
+# @param [String] cv_timeout_start_sec timeout for starting the clamd service.
 ##############################################################################
 class confdroid_clamav::params (
 
@@ -71,6 +77,10 @@ class confdroid_clamav::params (
   Boolean $cv_enable_clamd            = true,
   Boolean $cv_use_excludepaths        = true,
   String $cv_concurrentdatabasereload = 'no',
+  String $cv_clamd_max_mem            = '512M',
+  String $cv_clamd_cpu_quota          = '30%',
+  String $cv_nice_value               = '19',
+  String $cv_timeout_start_sec        = '420'
 
 ) {
   # service

templates/clamd_svc.erb

@@ -13,10 +13,10 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
 # Reload the database
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart = on-failure
-TimeoutStartSec=420
-MemoryLimit=1024M
-CPUQuota=30%
-Nice=19
+TimeoutStartSec=<%= @cv_timeout_start_sec %>
+MemoryMax=<%= @cv_clamd_max_mem %>
+CPUQuota=<%= @cv_clamd_cpu_quota %>
+Nice=<%= @cv_nice_value %>
 
 [Install]
 WantedBy = multi-user.target