Recommit for updates in build 18

doc/_index.html

@@ -98,6 +98,11 @@
       
             </li>
     
+            <li>
+      <span class='object_link'><a href="puppet_classes/confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span>
+      
+            </li>
+    
       </ul>
     </ul>
   

doc/puppet_class_list.html

@@ -78,6 +78,13 @@
     </li>
     
 
+    <li id="object_puppet_classes::confdroid_clamav::params" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span>
+      </div>
+    </li>
+    
+
 
       </ul>
     </div>

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <dd>confdroid_clamav::params</dd>
+    <dd><span class='object_link'><a href="confdroid_clamav_3A_3Aparams.html" title="puppet_classes::confdroid_clamav::params (puppet_class)">confdroid_clamav::params</a></span></dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Aparams.html

@@ -607,6 +607,24 @@ 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>
@@ -622,7 +640,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-49
 50
 51
 52
@@ -679,10 +696,12 @@ inherited by all classes except defines.
 103
 104
 105
-106</pre>
+106
+107
+108</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 50</span>
 
 class confdroid_clamav::params (
 
@@ -716,7 +735,8 @@ 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

@@ -79,7 +79,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'
 
 ) {

templates/clamd_svc.erb

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