Recommit for updates in build 12

doc/_index.html

@@ -98,11 +98,6 @@
       
             </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,13 +78,6 @@
     </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><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>
+    <dd>confdroid_clamav::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <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>
+    <dd>confdroid_clamav::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <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>
+    <dd>confdroid_clamav::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <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>
+    <dd>confdroid_clamav::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html

@@ -64,7 +64,7 @@
   
   <dl>
     <dt>Inherits:</dt>
-    <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>
+    <dd>confdroid_clamav::params</dd>
   </dl>
   
   

manifests/params.pp

@@ -45,6 +45,7 @@
 # @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,6 +80,7 @@ class confdroid_clamav::params (
   String $cv_clamd_max_mem            = '512M',
   String $cv_clamd_cpu_quota          = '30%',
   String $cv_nice_value               = '19'
+  String $cv_timeout_start_sec        = '420'
 
 ) {
   # service

templates/clamd_svc.erb

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