Recommit for updates in build 9

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 yes/no to optimize RAM consumption</p>
+<p>set ConcurrentDatabaseReload option <code>yes</code>/<code>no</code> to optimize RAM consumption. defaults to <code>no</code></p>
 </li><li>
 <p>manage services</p>
 </li></ul>

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 yes/no to optimize RAM consumption</p>
+<p>set ConcurrentDatabaseReload option <code>yes</code>/<code>no</code> to optimize RAM consumption. defaults to <code>no</code></p>
 </li><li>
 <p>manage services</p>
 </li></ul>

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html

@@ -158,7 +158,23 @@
 60
 61
 62
-63</pre>
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -193,6 +209,7 @@ 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
@@ -206,6 +223,21 @@ 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

doc/puppet_classes/confdroid_clamav_3A_3Aparams.html

@@ -550,6 +550,11 @@ 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>
@@ -563,10 +568,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-40
-41
-42
-43
 44
 45
 46
@@ -615,10 +616,16 @@ inherited by all classes except defines.
 89
 90
 91
-92</pre>
+92
+93
+94
+95
+96
+97
+98</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 44</span>
 
 class confdroid_clamav::params (
 
@@ -666,6 +673,8 @@ 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;