Recommit for updates in build 8

2026-09-22 13:17:49 +02:00
8 changed files with 10 additions and 95 deletions
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
 - manage required config files
 - 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`
+- set ConcurrentDatabaseReload option yes/no to optimize RAM consumption
 - manage services

 ## Dependencies
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -107,7 +107,7 @@
 </li><li>
 <p>run cron job to scan the file system (by default starting at root, configurable) via clamdscan</p>
 </li><li>
-<p>set ConcurrentDatabaseReload option <code>yes</code>/<code>no</code> to optimize RAM consumption. defaults to <code>no</code></p>
+<p>set ConcurrentDatabaseReload option yes/no to optimize RAM consumption</p>
 </li><li>
 <p>manage services</p>
 </li></ul>
--- a/doc/index.html
+++ b/doc/index.html
@@ -107,7 +107,7 @@
 </li><li>
 <p>run cron job to scan the file system (by default starting at root, configurable) via clamdscan</p>
 </li><li>
-<p>set ConcurrentDatabaseReload option <code>yes</code>/<code>no</code> to optimize RAM consumption. defaults to <code>no</code></p>
+<p>set ConcurrentDatabaseReload option yes/no to optimize RAM consumption</p>
 </li><li>
 <p>manage services</p>
 </li></ul>
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html
@@ -158,23 +158,7 @@
 60
 61
 62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79</pre>
+63</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -209,7 +193,6 @@ class confdroid_clamav::main::files (
    seltype  =&gt; etc_t,
    seluser  =&gt; system_u,
    content  =&gt; template($cv_freshclam_erb),
-    notify   =&gt; Service[$cv_freshclam],
  }

  # freshclam service config file
@@ -223,21 +206,6 @@ class confdroid_clamav::main::files (
    seltype  =&gt; etc_t,
    seluser  =&gt; system_u,
    content  =&gt; template($cv_freshclam_svc_erb),
-    notify   =&gt; Service[$cv_freshclam],
-  }
-
-  # clamd service config file
-  file { $cv_clamd_svc  :
-    ensure   =&gt; file,
-    owner    =&gt; &#39;root&#39;,
-    group    =&gt; &#39;root&#39;,
-    mode     =&gt; &#39;0600&#39;,
-    selrange =&gt; s0,
-    selrole  =&gt; object_r,
-    seltype  =&gt; etc_t,
-    seluser  =&gt; system_u,
-    content  =&gt; template($cv_clamd_svc_erb),
-    notify   =&gt; Service[$cv_service],
  }

  # shell script for scanning and alerting
--- a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
@@ -550,11 +550,6 @@ inherited by all classes except defines.
        <em class="default">(defaults to: <tt>&#39;no&#39;</tt>)</em>
      
      
-        &mdash;
-        <div class='inline'>
-<p>whether to enable concurrent 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’.</p>
-</div>
-      
    </li>
  
 </ul>
@@ -568,6 +563,10 @@ inherited by all classes except defines.
        <pre class="lines">


+40
+41
+42
+43
 44
 45
 46
@@ -616,16 +615,10 @@ inherited by all classes except defines.
 89
 90
 91
-92
-93
-94
-95
-96
-97
-98</pre>
+92</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 44</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span>

 class confdroid_clamav::params (

@@ -673,8 +666,6 @@ class confdroid_clamav::params (
  $cv_freshclam_erb       = &#39;confdroid_clamav/freshclam_conf.erb&#39;
  $cv_freshclam_svc       = &#39;/usr/lib/systemd/system/freshclam.service&#39;
  $cv_freshclam_svc_erb   = &#39;confdroid_clamav/freshclam_svc.erb&#39;
-  $cv_clamd_svc           = &#39;/usr/lib/systemd/system/clamd@.service&#39;
-  $cv_clamd_svc_erb       = &#39;confdroid_clamav/clamd_svc.erb&#39;
  $cv_shell_script        = &quot;${cv_config_d_dir}/scan.sh&quot;
  $cv_shell_script_erb    = &#39;confdroid_clamav/scan.sh.erb&#39;

--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -33,7 +33,6 @@ class confdroid_clamav::main::files (
    seltype  => etc_t,
    seluser  => system_u,
    content  => template($cv_freshclam_erb),
-    notify   => Service[$cv_freshclam],
  }

  # freshclam service config file
@@ -47,21 +46,6 @@ class confdroid_clamav::main::files (
    seltype  => etc_t,
    seluser  => system_u,
    content  => template($cv_freshclam_svc_erb),
-    notify   => Service[$cv_freshclam],
-  }
-
-  # clamd service config file
-  file { $cv_clamd_svc  :
-    ensure   => file,
-    owner    => 'root',
-    group    => 'root',
-    mode     => '0600',
-    selrange => s0,
-    selrole  => object_r,
-    seltype  => etc_t,
-    seluser  => system_u,
-    content  => template($cv_clamd_svc_erb),
-    notify   => Service[$cv_service],
  }

  # shell script for scanning and alerting
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -36,10 +36,6 @@
 # @param [Boolean] cv_enable_freshclam whether to enable the freshclam service
 # @param [Boolean] cv_enable_clamd whether to enable the clamd service
 # @param [Boolean] cv_use_excludepaths whether to use advanced exclude paths
-# @param [String] cv_concurrentdatabasereload whether to enable concurrent
-#   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'.
 ##############################################################################
 class confdroid_clamav::params (

@@ -87,8 +83,6 @@ class confdroid_clamav::params (
  $cv_freshclam_erb       = 'confdroid_clamav/freshclam_conf.erb'
  $cv_freshclam_svc       = '/usr/lib/systemd/system/freshclam.service'
  $cv_freshclam_svc_erb   = 'confdroid_clamav/freshclam_svc.erb'
-  $cv_clamd_svc           = '/usr/lib/systemd/system/clamd@.service'
-  $cv_clamd_svc_erb       = 'confdroid_clamav/clamd_svc.erb'
  $cv_shell_script        = "${cv_config_d_dir}/scan.sh"
  $cv_shell_script_erb    = 'confdroid_clamav/scan.sh.erb'

--- a/templates/clamd_svc.erb
+++ b/templates/clamd_svc.erb
@@ -1,22 +0,0 @@
-################################################################################
-###    clamd.svc created by Puppet, manual changes will be overwritten!!!    ###
-################################################################################
-
-[Unit]
-Description = clamd scanner (%i) daemon
-Documentation=man:clamd(8) man:clamd.conf(5) https://www.clamav.net/documents/
-After = syslog.target nss-lookup.target network.target
-
-[Service]
-Type = forking
-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
-
-[Install]
-WantedBy = multi-user.target