Recommit for updates in build 3

README.md

@@ -9,7 +9,7 @@
   - [WARNING](#warning)
   - [Features](#features)
   - [Dependencies](#dependencies)
-  - [Deployment](#deployment)
+    - [Deployment](#deployment)
   - [Parameters](#parameters)
   - [SELINUX](#selinux)
   - [Support](#support)
@@ -41,7 +41,7 @@ All dependencies must be included in the catalogue.
 
 - [confdroid_resources](https://sourcecode.confdroid.com/confdroid/confdroid_resources) for managing yum repo resources.
 
-## Deployment
+### Deployment
 
 - native Puppet deployment
 

doc/file.README.html

@@ -71,8 +71,9 @@
 <p><a href="#features">Features</a></p>
 </li><li>
 <p><a href="#dependencies">Dependencies</a></p>
-</li><li>
+<ul><li>
 <p><a href="#deployment">Deployment</a></p>
+</li></ul>
 </li><li>
 <p><a href="#parameters">Parameters</a></p>
 </li><li>
@@ -117,7 +118,7 @@
 <p><a href="https://sourcecode.confdroid.com/confdroid/confdroid_resources">confdroid_resources</a> for managing yum repo resources.</p>
 </li></ul>
 
-<h2 id="label-Deployment">Deployment</h2>
+<h3 id="label-Deployment">Deployment</h3>
 <ul><li>
 <p>native Puppet deployment</p>
 </li></ul>

doc/index.html

@@ -71,8 +71,9 @@
 <p><a href="#features">Features</a></p>
 </li><li>
 <p><a href="#dependencies">Dependencies</a></p>
-</li><li>
+<ul><li>
 <p><a href="#deployment">Deployment</a></p>
+</li></ul>
 </li><li>
 <p><a href="#parameters">Parameters</a></p>
 </li><li>
@@ -117,7 +118,7 @@
 <p><a href="https://sourcecode.confdroid.com/confdroid/confdroid_resources">confdroid_resources</a> for managing yum repo resources.</p>
 </li></ul>
 
-<h2 id="label-Deployment">Deployment</h2>
+<h3 id="label-Deployment">Deployment</h3>
 <ul><li>
 <p>native Puppet deployment</p>
 </li></ul>

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html

@@ -120,8 +120,8 @@ class confdroid_clamav::main::install (
 ) inherits confdroid_clamav::params {
   require confdroid_resources::main::epel
 
-  package { $cv_reqpackages:
+  package { $reqpackages:
-    ensure => $cv_pkg_ensure,
+    ensure => $pkg_ensure,
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_clamav_3A_3Aparams.html

@@ -109,7 +109,7 @@ inherited by all classes except defines.
   
     <li>
       
-        <span class='name'>cv_reqpackages</span>
+        <span class='name'>reqpackages</span>
       
       
         <span class='type'>(<tt>Array</tt>)</span>
@@ -127,7 +127,7 @@ inherited by all classes except defines.
   
     <li>
       
-        <span class='name'>cv_pkg_ensure</span>
+        <span class='name'>pkg_ensure</span>
       
       
         <span class='type'>(<tt>String</tt>)</span>
@@ -517,24 +517,6 @@ inherited by all classes except defines.
         &mdash;
         <div class='inline'>
 <p>whether to enable the clamd service</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cv_use_excludepaths</span>
-      
-      
-        <span class='type'>(<tt>Boolean</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>true</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>whether to use advanced exclude paths</p>
 </div>
       
     </li>
@@ -550,6 +532,7 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
+39
 40
 41
 42
@@ -599,18 +582,16 @@ inherited by all classes except defines.
 86
 87
 88
-89
+89</pre>
-90
-91</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 39</span>
 
 class confdroid_clamav::params (
 
 # installation
-  Array $cv_reqpackages              = [&#39;clamav&#39;,&#39;clamd&#39;,&#39;s-nail&#39;],
+  Array $reqpackages              = [&#39;clamav&#39;,&#39;clamd&#39;,&#39;s-nail&#39;],
-  String $cv_pkg_ensure              = &#39;present&#39;,
+  String $pkg_ensure              = &#39;present&#39;,
 
 # clamd
   String $cv_logfile              = &#39;/var/log/clamd.scan&#39;,
@@ -634,7 +615,6 @@ class confdroid_clamav::params (
   String $cv_alert_file           = &#39;tmp/clamav-alert.txt&#39;,
   Boolean $cv_enable_freshclam    = true,
   Boolean $cv_enable_clamd        = true,
-  Boolean $cv_use_excludepaths    = true
 
 ) {
   # service

manifests/main/install.pp

@@ -9,7 +9,7 @@ class confdroid_clamav::main::install (
 ) inherits confdroid_clamav::params {
   require confdroid_resources::main::epel
 
-  package { $cv_reqpackages:
+  package { $reqpackages:
-    ensure => $cv_pkg_ensure,
+    ensure => $pkg_ensure,
   }
 }

manifests/params.pp

@@ -3,8 +3,8 @@
 # Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary  Class holds all parameters for the confdroid_clamav module and is
 #   inherited by all classes except defines.
-# @param [Array] cv_reqpackages List of packages to install.
+# @param [Array] reqpackages List of packages to install.
-# @param [String] cv_pkg_ensure
+# @param [String] pkg_ensure
 #   which [package type](https://confdroid.com/2017/05/puppet-type-package/)
 #   to choose, i.e. `latest` or `present`.
 # @param [String] cv_logfile where to log messages for the clamd service.
@@ -35,13 +35,12 @@
 # @param [String] cv_alert_file location and name of the alert file
 # @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
 ##############################################################################
 class confdroid_clamav::params (
 
 # installation
-  Array $cv_reqpackages              = ['clamav','clamd','s-nail'],
+  Array $reqpackages              = ['clamav','clamd','s-nail'],
-  String $cv_pkg_ensure              = 'present',
+  String $pkg_ensure              = 'present',
 
 # clamd
   String $cv_logfile              = '/var/log/clamd.scan',
@@ -65,7 +64,6 @@ class confdroid_clamav::params (
   String $cv_alert_file           = 'tmp/clamav-alert.txt',
   Boolean $cv_enable_freshclam    = true,
   Boolean $cv_enable_clamd        = true,
-  Boolean $cv_use_excludepaths    = true
 
 ) {
   # service

templates/scan_conf.erb

@@ -21,7 +21,7 @@ PreludeAnalyzerName ClamAV
 
 # Log additional information about the infected file, such as its
 # size and hash, together with the virus name.
-ExtendedDetectionInfo yes
+#ExtendedDetectionInfo yes
 
 # This option allows you to save a process identifier of the listening
 # daemon (main thread).
@@ -132,28 +132,6 @@ ExtendedDetectionInfo yes
 #ExcludePath ^/proc/
 #ExcludePath ^/sys/
 
-<% if @cv_use_excludepaths %>
-ExcludePath ^/proc
-ExcludePath ^/sys
-ExcludePath ^/dev
-ExcludePath ^/run
-ExcludePath ^/var/run
-ExcludePath ^/var/tmp
-ExcludePath ^/tmp
-ExcludePath ^/var/lib/clamav
-ExcludePath ^/var/log/clamav
-ExcludePath ^/var/lib/docker
-ExcludePath ^/var/lib/containerd
-ExcludePath ^/var/lib/kubelet/pods
-ExcludePath ^/var/lib/kubelet/plugins
-ExcludePath ^/var/lib/kubelet/plugins_registry
-ExcludePath ^/var/log/pods
-ExcludePath ^/var/log/containers
-ExcludePath ^/var/cache
-ExcludePath ^/run/containerd
-ExcludePath ^/run/docker
-<% end %>
-
 # Maximum depth directories are scanned at.
 # Default: 15
 #MaxDirectoryRecursion 20