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

Auto-merge for build 11

See merge request puppet/clamav_cd!8

.vscode/settings.json

@@ -1,11 +1,20 @@
 {
     "cSpell.words": [
+        "ALLMATCHSCAN",
+        "authenticode",
+        "behaviour",
+        "bofh",
         "clamd",
         "clamscan",
+        "Clamuko",
         "clamupdate",
+        "Dazuko",
         "dbname",
         "epel",
+        "fanotify",
+        "filesize",
         "freshclam",
+        "INADDR",
         "libclamav",
         "logclean",
         "logfacility",
@@ -19,11 +28,20 @@
         "mypass",
         "myproxy",
         "myusername",
+        "NOFILE",
+        "normalisation",
+        "PCRE",
         "preludeanalyzername",
         "preludeenable",
+        "RLIMIT",
         "safebrowsing",
+        "subsig",
+        "subsigs",
         "tcpaddre",
         "tcpaddress",
-        "tcpsocket"
+        "tcpsocket",
+        "virusgroup",
+        "XMLDOCS",
+        "xxxyyzzzz"
     ]
 }

templates/scan_conf.erb

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