Recommit for updates in build 11

doc/puppet_classes/confdroid_clamav_3A_3Aparams.html

@@ -607,24 +607,6 @@ inherited by all classes except defines.
         —
         <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>
-  
-    <li>
-      
-        <span class='name'>cv_timeout_start_sec</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;420&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>timeout for starting the clamd service.</p>
 </div>
       
     </li>
@@ -640,6 +622,7 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
+49
 50
 51
 52
@@ -696,12 +679,10 @@ inherited by all classes except defines.
 103
 104
 105
-106
+106</pre>
-107
-108</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 50</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 49</span>
 
 class confdroid_clamav::params (
 
@@ -735,8 +716,7 @@ class confdroid_clamav::params (
   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;,
+  String $cv_nice_value               = &#39;19&#39;
-  String $cv_timeout_start_sec        = &#39;420&#39;
 
 ) {
   # service

manifests/params.pp

@@ -45,7 +45,6 @@
 # @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.
-# @param [String] cv_timeout_start_sec timeout for starting the clamd service.
 ##############################################################################
 class confdroid_clamav::params (
 
@@ -79,8 +78,7 @@ class confdroid_clamav::params (
   String $cv_concurrentdatabasereload = 'no',
   String $cv_clamd_max_mem            = '512M',
   String $cv_clamd_cpu_quota          = '30%',
-  String $cv_nice_value               = '19',
+  String $cv_nice_value               = '19'
-  String $cv_timeout_start_sec        = '420'
 
 ) {
   # service

templates/clamd_svc.erb

@@ -13,8 +13,8 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
 # Reload the database
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart = on-failure
-TimeoutStartSec=<%= @cv_timeout_start_sec %>
+TimeoutStartSec=420
-MemoryMax=<%= @cv_clamd_max_mem %>
+MemoryLimit=<%= @cv_clamd_max_mem %>
 CPUQuota=<%= @cv_clamd_cpu_quota %>
 Nice=<%= @cv_nice_value %>