Merge branch 'jenkins-build-10' into 'master'

Auto-merge for build 10

See merge request puppet/clamav_cd!7

.vscode/settings.json

@@ -21,6 +21,9 @@
         "myusername",
         "preludeanalyzername",
         "preludeenable",
-        "safebrowsing"
+        "safebrowsing",
+        "tcpaddre",
+        "tcpaddress",
+        "tcpsocket"
     ]
 }

doc/puppet_classes/clamav_cd_3A_3Aparams.html

@@ -337,6 +337,42 @@ inherited by all classes except defines.
         —
         <div class='inline'>
 <p>name of the analyzer used by prelude-admin.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cv_tcpsocket</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;3310&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>socket port</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cv_tcpaddress</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;127.0.0.1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>ip address to listen on</p>
 </div>
       
     </li>
@@ -352,8 +388,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-29
-30
 31
 32
 33
@@ -390,10 +424,14 @@ inherited by all classes except defines.
 64
 65
 66
-67</pre>
+67
+68
+69
+70
+71</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 29</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
 
 class clamav_cd::params (
 
@@ -413,6 +451,8 @@ class clamav_cd::params (
   String $cv_logrotate            = &#39;yes&#39;,
   String $cv_preludeenable        = &#39;no&#39;,
   String $cv_preludeanalyzername  = &#39;ClamAV&#39;,
+  String $cv_tcpsocket            = &#39;3310&#39;,
+  String $cv_tcpaddress           = &#39;127.0.0.1&#39;,
 
 ) {
   # service

manifests/params.pp

@@ -25,6 +25,8 @@
 # @param [String] cv_preludeenable whether to enable prelude output.
 # @param [String] cv_preludeanalyzername name of the analyzer used by
 #   prelude-admin.
+# @param [String] cv_tcpsocket socket port
+# @param [String] cv_tcpaddress ip address to listen on
 ##############################################################################
 class clamav_cd::params (
 
@@ -44,6 +46,8 @@ class clamav_cd::params (
   String $cv_logrotate            = 'yes',
   String $cv_preludeenable        = 'no',
   String $cv_preludeanalyzername  = 'ClamAV',
+  String $cv_tcpsocket            = '3310',
+  String $cv_tcpaddress           = '127.0.0.1',
 
 ) {
   # service

templates/scan_conf.erb

@@ -12,7 +12,8 @@ LogFacility     <%= @cv_logfacility %>
 LogVerbose      <%= @cv_logverbose %>
 LogRotate       <%= @cv_logrotate %>
 PreludeEnable   <%= @cv_preludeenable %>
-
+TCPSocket       <%= @cv_tcpsocket %>
+TCPAddr         <<%= @cv_tcpaddress %>
 #
 # Set the name of the analyzer used by prelude-admin.
 # Default: ClamAV