From 3856974c2f2ee96e972243840b7ba87a8c34bfaf Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Wed, 12 Feb 2025 11:54:09 +0100 Subject: [PATCH] recommit for updates in build 214 --- .../cd_haproxy_3A_3Aparams.html | 69 ++++++++++++++++--- .../cd_haproxy_3A_3Aserver_3A_3Aproxy.html | 16 +---- 2 files changed, 60 insertions(+), 25 deletions(-) diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index 4e5fc6d..c0b0793 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -442,7 +442,7 @@ rsyslog forwarding supported.

(string) - (defaults to: 'http') + (defaults to: 'tcp') — @@ -553,7 +553,7 @@ disables.

(boolean) - (defaults to: false) + (defaults to: true) — @@ -626,7 +626,7 @@ failure.

(string) - (defaults to: '10s') + (defaults to: '5000') — @@ -645,7 +645,7 @@ succeed.

(string) - (defaults to: '1m') + (defaults to: '50000') — @@ -663,7 +663,7 @@ succeed.

(string) - (defaults to: '1m') + (defaults to: '50000') — @@ -709,6 +709,45 @@ succeed.

+
  • + + hy_log_local0 + + + (Any) + + + (defaults to: true) + + +
  • + +
  • + + hy_log_local1 + + + (Any) + + + (defaults to: true) + + +
  • + +
  • + + hy_use_tcplog + + + (Any) + + + (defaults to: true) + + +
  • + @@ -797,7 +836,11 @@ succeed.

    132 133 134 -135 +135 +136 +137 +138 +139
    # File 'manifests/params.pp', line 58
    @@ -821,16 +864,16 @@ $hy_pid                       = '/var/run/haproxy.pid',
     $hy_maxconn                   = '4000',
     $hy_show_stats                = true,
     $hy_stats_socket              = '/var/lib/haproxy/stats',
    -$hy_default_mode              = 'http',
    +$hy_default_mode              = 'tcp',
     $hy_use_http_server_close     = false,
     $hy_use_forward_for           = false,
    -$hy_use_redispatch            = false,
    +$hy_use_redispatch            = true,
     $hy_max_retries               = '3',
     $hy_timeout_http_request      = '10s',
     $hy_timeout_queue             = '1m',
    -$hy_timeout_connect           = '10s',
    -$hy_timeout_client            = '1m',
    -$hy_timeout_server            = '1m',
    +$hy_timeout_connect           = '5000',
    +$hy_timeout_client            = '50000',
    +$hy_timeout_server            = '50000',
     $hy_timeout_http_keep_alive   = '10s',
     $hy_timeout_check             = '10s',
     
    @@ -841,12 +884,16 @@ $hy_user_home                 = '/var/lib/haproxy',
     $hy_user_shell                = '/sbin/nologin',
     
     # logging
    +$hy_log_local0                = true,
    +$hy_log_local1                = true,
     $hy_log_target                = '127.0.0.1',
     $hy_log_facility              = 'local2',
     $hy_log_default               = 'global',
    +$hy_use_tcplog                = true,
     $hy_use_httplog               = false,
     $hy_use_dontlognull           = true,
     
    +
     ) {
     
     # service
    diff --git a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
    index 9b70c3c..0f7736b 100644
    --- a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
    +++ b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
    @@ -502,13 +502,7 @@ instance configuration.

    81 82 83 -84 -85 -86 -87 -88 -89 -90
    +84
    # File 'manifests/server/proxy.pp', line 24
    @@ -536,7 +530,6 @@ define cd_haproxy::server::proxy (
       $fe_http_request  = '',
       $backend_configs  = [],
     
    -
     ) {
     
       $hy_main_config   = '/etc/haproxy/haproxy.cfg'
    @@ -571,13 +564,8 @@ define cd_haproxy::server::proxy (
         'order'   => $backend_order,
       })
     
    +  # open sepcific firewall ports
     
    -#  # create backend section
    -#  concat::fragment { "backend_${name}":
    -#    target  =>  $hy_main_config,
    -#    content =>  template($hy_backendrule),
    -#    order   =>  $backend_order,
    -#  }
     
     }