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

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>
   
   

manifests/params.pp

@@ -40,33 +40,32 @@
 class confdroid_clamav::params (
 
 # installation
-  Array $cv_reqpackages               = ['clamav','clamd','s-nail'],
+  Array $cv_reqpackages              = ['clamav','clamd','s-nail'],
-  String $cv_pkg_ensure               = 'present',
+  String $cv_pkg_ensure              = 'present',
 
 # clamd
-  String $cv_logfile                  = '/var/log/clamd.scan',
+  String $cv_logfile              = '/var/log/clamd.scan',
-  String $cv_logfileunlock            = 'no',
+  String $cv_logfileunlock        = 'no',
-  String $cv_logfilemaxsize           = '2M',
+  String $cv_logfilemaxsize       = '2M',
-  String $cv_logtime                  = 'yes',
+  String $cv_logtime              = 'yes',
-  String $cv_logclean                 = 'no',
+  String $cv_logclean             = 'no',
-  String $cv_logsyslog                = 'yes',
+  String $cv_logsyslog            = 'yes',
-  String $cv_logfacility              = 'LOG_MAIL',
+  String $cv_logfacility          = 'LOG_MAIL',
-  String $cv_logverbose               = 'no',
+  String $cv_logverbose           = 'no',
-  String $cv_logrotate                = 'yes',
+  String $cv_logrotate            = 'yes',
-  String $cv_preludeenable            = 'no',
+  String $cv_preludeenable        = 'no',
-  String $cv_preludeanalyzername      = 'ClamAV',
+  String $cv_preludeanalyzername  = 'ClamAV',
-  String $cv_tcpsocket                = '3310',
+  String $cv_tcpsocket            = '3310',
-  String $cv_tcpaddress               = 'localhost',
+  String $cv_tcpaddress           = 'localhost',
-  String $cv_alert_email              = 'you@example.com',
+  String $cv_alert_email          = 'you@example.com',
-  String $cv_cron_hour                = '2',
+  String $cv_cron_hour            = '2',
-  String $cv_cron_minute              = '0',
+  String $cv_cron_minute          = '0',
-  String $cv_cron_user                = 'root',
+  String $cv_cron_user            = 'root',
-  String $cv_scan_dir                 = '/',
+  String $cv_scan_dir             = '/',
-  String $cv_alert_file               = 'tmp/clamav-alert.txt',
+  String $cv_alert_file           = 'tmp/clamav-alert.txt',
-  Boolean $cv_enable_freshclam        = true,
+  Boolean $cv_enable_freshclam    = true,
-  Boolean $cv_enable_clamd            = true,
+  Boolean $cv_enable_clamd        = true,
-  Boolean $cv_use_excludepaths        = true
+  Boolean $cv_use_excludepaths    = true
-  String $cv_concurrentdatabasereload = 'no'
 
 ) {
   # service

templates/scan_conf.erb

@@ -14,7 +14,6 @@ LogRotate       <%= @cv_logrotate %>
 PreludeEnable   <%= @cv_preludeenable %>
 TCPSocket       <%= @cv_tcpsocket %>
 TCPAddr         <%= @cv_tcpaddress %>
-ConcurrentDatabaseReload <%= @cv_concurrentdatabasereload %>
 #
 # Set the name of the analyzer used by prelude-admin.
 # Default: ClamAV