Recommit for updates in build 10

doc/puppet_classes/confdroid_clamav_3A_3Aparams.html

@@ -553,60 +553,6 @@ inherited by all classes except defines.
         —
         <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>
-  
-    <li>
-      
-        <span class='name'>cv_clamd_max_mem</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;512M&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>maximum memory usage for clamd.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cv_clamd_cpu_quota</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;30%&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>maximum CPU usage for clamd.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cv_nice_value</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;19&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>nice value for clamd. This is a number between -20 and 19. The lower the number, the higher the priority. The default is 19, which is the lowest priority.</p>
 </div>
       
     </li>
@@ -622,6 +568,11 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
+44
+45
+46
+47
+48
 49
 50
 51
@@ -671,18 +622,10 @@ inherited by all classes except defines.
 95
 96
 97
-98
-99
-100
-101
-102
-103
-104
-105
-106</pre>
+98</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 49</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 44</span>
 
 class confdroid_clamav::params (
 
@@ -714,9 +657,6 @@ class confdroid_clamav::params (
   Boolean $cv_enable_clamd            = true,
   Boolean $cv_use_excludepaths        = true,
   String $cv_concurrentdatabasereload = &#39;no&#39;,
-  String $cv_clamd_max_mem            = &#39;512M&#39;,
-  String $cv_clamd_cpu_quota          = &#39;30%&#39;,
-  String $cv_nice_value               = &#39;19&#39;
 
 ) {
   # service

manifests/params.pp

@@ -40,11 +40,6 @@
 #   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'.
-# @param [String] cv_clamd_max_mem maximum memory usage for clamd. 
-# @param [String] cv_clamd_cpu_quota maximum CPU usage for clamd.
-# @param [String] cv_nice_value nice value for clamd. This is a number between
-#   -20 and 19. The lower the number, the higher the priority. The default is 
-#   19, which is the lowest priority.
 ##############################################################################
 class confdroid_clamav::params (
 
@@ -76,9 +71,6 @@ class confdroid_clamav::params (
   Boolean $cv_enable_clamd            = true,
   Boolean $cv_use_excludepaths        = true,
   String $cv_concurrentdatabasereload = 'no',
-  String $cv_clamd_max_mem            = '512M',
-  String $cv_clamd_cpu_quota          = '30%',
-  String $cv_nice_value               = '19'
 
 ) {
   # service

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=420
-MemoryLimit=<%= @cv_clamd_max_mem %>
-CPUQuota=<%= @cv_clamd_cpu_quota %>
-Nice=<%= @cv_nice_value %>
+MemoryLimit=1024M
+CPUQuota=30%
+Nice=19
 
 [Install]
 WantedBy = multi-user.target