Merge branch 'jenkins-build-18' into 'master'

Auto-merge for build 18

See merge request puppet/clamav_cd!15

.vscode/settings.json

@@ -4,6 +4,7 @@
         "authenticode",
         "behaviour",
         "bofh",
+        "clamav",
         "clamd",
         "clamonacc",
         "clamscan",

doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html

@@ -119,7 +119,25 @@
 21
 22
 23
-24</pre>
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
@@ -129,18 +147,36 @@ class clamav_cd::main::service (
 ) inherits clamav_cd::params {
   require clamav_cd::main::files
 
-  service { $cv_service:
-    ensure     =&gt; running,
-    hasstatus  =&gt; true,
-    hasrestart =&gt; true,
-    enable     =&gt; true,
+  if $cv_enable_clamd == true {
+    service { $cv_service:
+      ensure     =&gt; running,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; true,
+    }
+  } else {
+    service { $cv_service:
+      ensure     =&gt; stopped,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; false,
+    }
   }
 
-  service { $cv_freshclam:
-    ensure     =&gt; running,
-    hasstatus  =&gt; true,
-    hasrestart =&gt; true,
-    enable     =&gt; true,
+  if $cv_enable_freshclam == true {
+    service { $cv_freshclam:
+      ensure     =&gt; running,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; true,
+    }
+  } else {
+    service { $cv_freshclam:
+      ensure     =&gt; stopped,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; false,
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/clamav_cd_3A_3Aparams.html

@@ -481,6 +481,42 @@ inherited by all classes except defines.
         —
         <div class='inline'>
 <p>location and name of the alert file</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cv_enable_freshclam</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to enable the freshclam service</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cv_enable_clamd</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to enable the clamd service</p>
 </div>
       
     </li>
@@ -496,8 +532,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-37
-38
 39
 40
 41
@@ -545,10 +579,13 @@ inherited by all classes except defines.
 83
 84
 85
-86</pre>
+86
+87
+88
+89</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 37</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 39</span>
 
 class clamav_cd::params (
 
@@ -576,7 +613,8 @@ class clamav_cd::params (
   String $cv_cron_user            = &#39;root&#39;,
   String $cv_scan_dir             = &#39;/&#39;,
   String $cv_alert_file           = &#39;tmp/clamav-alert.txt&#39;,
-
+  Boolean $cv_enable_freshclam    = true,
+  Boolean $cv_enable_clamd        = true,
 
 ) {
   # service

manifests/main/service.pp

@@ -8,17 +8,35 @@ class clamav_cd::main::service (
 ) inherits clamav_cd::params {
   require clamav_cd::main::files
 
-  service { $cv_service:
-    ensure     => running,
-    hasstatus  => true,
-    hasrestart => true,
-    enable     => true,
+  if $cv_enable_clamd == true {
+    service { $cv_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  } else {
+    service { $cv_service:
+      ensure     => stopped,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => false,
+    }
   }
 
-  service { $cv_freshclam:
-    ensure     => running,
-    hasstatus  => true,
-    hasrestart => true,
-    enable     => true,
+  if $cv_enable_freshclam == true {
+    service { $cv_freshclam:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  } else {
+    service { $cv_freshclam:
+      ensure     => stopped,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => false,
+    }
   }
 }

manifests/params.pp

@@ -33,6 +33,8 @@
 # @param [String] cv_cron_user which user should run the cron job
 # @param [String] cv_scan_dir which directory should be scanned
 # @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
 ##############################################################################
 class clamav_cd::params (
 
@@ -60,7 +62,8 @@ class clamav_cd::params (
   String $cv_cron_user            = 'root',
   String $cv_scan_dir             = '/',
   String $cv_alert_file           = 'tmp/clamav-alert.txt',
-
+  Boolean $cv_enable_freshclam    = true,
+  Boolean $cv_enable_clamd        = true,
 
 ) {
   # service