Merge remote-tracking branch 'origin/master' into jenkins-build-16

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html

@@ -110,14 +110,7 @@ confdroid_clamav
 12
 13
 14
-15
+15</pre>
-16
-17
-18
-19
-20
-21
-22</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 7</span>
@@ -127,16 +120,9 @@ class confdroid_clamav::main::install (
 ) inherits confdroid_clamav::params {
   require confdroid_resources::main::epel
 
-  if $cv_enable_clamd  == true {
+  package { $cv_reqpackages:
-    package { &#39;clamd&#39;:
     ensure =&gt; $cv_pkg_ensure,
   }
-  }
-  else {
-    package { &#39;clamd&#39;:
-      ensure =&gt; &#39;absent&#39;,
-    }
-  }
 }</pre>
       </td>
     </tr>

manifests/main/install.pp

@@ -9,14 +9,7 @@ class confdroid_clamav::main::install (
 ) inherits confdroid_clamav::params {
   require confdroid_resources::main::epel
 
-  if $cv_enable_clamd  == true {
+  package { $cv_reqpackages:
-    package { 'clamd':
     ensure => $cv_pkg_ensure,
   }
-  }
-  else {
-    package { 'clamd':
-      ensure => 'absent',
-    }
-  }
 }

templates/clamd_svc.erb

@@ -14,9 +14,9 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart = on-failure
 TimeoutStartSec=<%= @cv_timeout_start_sec %>
-MemoryMax=<%= @cv_clamd_max_mem %>
+# MemoryMax=<%= @cv_clamd_max_mem %>
-CPUQuota=<%= @cv_clamd_cpu_quota %>
+# CPUQuota=<%= @cv_clamd_cpu_quota %>
-Nice=<%= @cv_nice_value %>
+# Nice=<%= @cv_nice_value %>
 
 [Install]
 WantedBy = multi-user.target