diff --git a/.vscode/settings.json b/.vscode/settings.json index 237f0a1..d08d153 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,6 +21,9 @@ "myusername", "preludeanalyzername", "preludeenable", - "safebrowsing" + "safebrowsing", + "tcpaddre", + "tcpaddress", + "tcpsocket" ] } \ No newline at end of file diff --git a/doc/puppet_classes/clamav_cd_3A_3Aparams.html b/doc/puppet_classes/clamav_cd_3A_3Aparams.html index 9c4d016..7e847fb 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Aparams.html +++ b/doc/puppet_classes/clamav_cd_3A_3Aparams.html @@ -337,6 +337,42 @@ inherited by all classes except defines. —

name of the analyzer used by prelude-admin.

+
+ + + +
  • + + cv_tcpsocket + + + (String) + + + (defaults to: '3310') + + + — +
    +

    socket port

    +
    + +
  • + +
  • + + cv_tcpaddress + + + (String) + + + (defaults to: '127.0.0.1') + + + — +
    +

    ip address to listen on

  • @@ -352,8 +388,6 @@ inherited by all classes except defines.
     
     
    -29
    -30
     31
     32
     33
    @@ -390,29 +424,35 @@ inherited by all classes except defines.
     64
     65
     66
    -67
    +67 +68 +69 +70 +71 -
    # File 'manifests/params.pp', line 29
    +        
    # File 'manifests/params.pp', line 31
     
     class clamav_cd::params (
     
     # installation
    -  Array $reqpackages            = ['clamav','clamd'],
    -  String $pkg_ensure             = 'present',
    +  Array $reqpackages              = ['clamav','clamd'],
    +  String $pkg_ensure              = 'present',
     
     # clamd
    -  String $cv_logfile             = '/var/log/clamd.scan',
    -  String $cv_logfileunlock       = 'no',
    -  String $cv_logfilemaxsize      = '2M',
    -  String $cv_logtime             = 'yes',
    -  String $cv_logclean            = 'no',
    -  String $cv_logsyslog           = 'yes',
    -  String $cv_logfacility         = 'LOG_MAIL',
    -  String $cv_logverbose          = 'no',
    -  String $cv_logrotate           = 'yes',
    -  String $cv_preludeenable       = 'no',
    -  String $cv_preludeanalyzername = 'ClamAV',
    +  String $cv_logfile              = '/var/log/clamd.scan',
    +  String $cv_logfileunlock        = 'no',
    +  String $cv_logfilemaxsize       = '2M',
    +  String $cv_logtime              = 'yes',
    +  String $cv_logclean             = 'no',
    +  String $cv_logsyslog            = 'yes',
    +  String $cv_logfacility          = 'LOG_MAIL',
    +  String $cv_logverbose           = 'no',
    +  String $cv_logrotate            = 'yes',
    +  String $cv_preludeenable        = 'no',
    +  String $cv_preludeanalyzername  = 'ClamAV',
    +  String $cv_tcpsocket            = '3310',
    +  String $cv_tcpaddress           = '127.0.0.1',
     
     ) {
       # service
    diff --git a/manifests/params.pp b/manifests/params.pp
    index e8a0ec1..cf0d581 100644
    --- a/manifests/params.pp
    +++ b/manifests/params.pp
    @@ -25,25 +25,29 @@
     # @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 (
     
     # installation
    -  Array $reqpackages            = ['clamav','clamd'],
    -  String $pkg_ensure             = 'present',
    +  Array $reqpackages              = ['clamav','clamd'],
    +  String $pkg_ensure              = 'present',
     
     # clamd
    -  String $cv_logfile             = '/var/log/clamd.scan',
    -  String $cv_logfileunlock       = 'no',
    -  String $cv_logfilemaxsize      = '2M',
    -  String $cv_logtime             = 'yes',
    -  String $cv_logclean            = 'no',
    -  String $cv_logsyslog           = 'yes',
    -  String $cv_logfacility         = 'LOG_MAIL',
    -  String $cv_logverbose          = 'no',
    -  String $cv_logrotate           = 'yes',
    -  String $cv_preludeenable       = 'no',
    -  String $cv_preludeanalyzername = 'ClamAV',
    +  String $cv_logfile              = '/var/log/clamd.scan',
    +  String $cv_logfileunlock        = 'no',
    +  String $cv_logfilemaxsize       = '2M',
    +  String $cv_logtime              = 'yes',
    +  String $cv_logclean             = 'no',
    +  String $cv_logsyslog            = 'yes',
    +  String $cv_logfacility          = 'LOG_MAIL',
    +  String $cv_logverbose           = 'no',
    +  String $cv_logrotate            = 'yes',
    +  String $cv_preludeenable        = 'no',
    +  String $cv_preludeanalyzername  = 'ClamAV',
    +  String $cv_tcpsocket            = '3310',
    +  String $cv_tcpaddress           = '127.0.0.1',
     
     ) {
       # service
    diff --git a/templates/scan_conf.erb b/templates/scan_conf.erb
    index 0315039..28e01a1 100755
    --- a/templates/scan_conf.erb
    +++ b/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