diff --git a/CHANGELOG.md b/CHANGELOG.md index eb03f4f..a127804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+dde6c78663accbf Jenkins ConfDroid 2018-12-19 15:08:40 +

+

recommit for updates in build 11

+ +

+677ad6914852361 Arne Teuke 2018-12-19 15:07:59 +

+

adds options

+ +

8e5168e7bd446e3 Jenkins ConfDroid 2018-12-18 15:23:43

recommit for updates in build 10

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index 1aacff7..31b2ce0 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -529,6 +529,207 @@ disables.

+
  • + + hy_use_http_server_close + + + (boolean) + + + (defaults to: true) + + + — +
    +

    Enable or disable HTTP connection closing on the server side

    +
    + +
    • + +
  • + + hy_use_forward_for + + + (boolean) + + + (defaults to: true) + + + — +
    +

    Enable insertion of the X-Forwarded-For header to requests sent to servers.

    +
    + +
    • + +
  • + + hy_use_redispatch + + + (boolean) + + + (defaults to: true) + + + — +
    +

    Enable or disable session redistribution in case of connection failure.

    +
    + +
    • + +
  • + + hy_max_retries + + + (string) + + + (defaults to: '3') + + + — +
    +

    Set the number of retries to perform on a server after a connection +failure.

    +
    + +
    • + +
  • + + hy_timeout_http_request + + + (string) + + + (defaults to: '10s') + + + — +
    +

    Set the maximum allowed time to wait for a complete HTTP request.

    +
    + +
    • + +
  • + + hy_timeout_queue + + + (string) + + + (defaults to: '1m') + + + — +
    +

    Set the maximum time to wait in the queue for a connection slot to be free.

    +
    + +
    • + +
  • + + hy_hy_timeout_connect + + + (string) + + + + — +
    +

    Set the maximum time to wait for a connection attempt to a server to +succeed.

    +
    + +
    • + +
  • + + hy_timeout_client + + + (string) + + + (defaults to: '1m') + + + — +
    +

    Set the maximum inactivity time on the client side.

    +
    + +
    • + +
  • + + hy_timeout_server + + + (string) + + + (defaults to: '1m') + + + — +
    +

    Set the maximum inactivity time on the server side.

    +
    + +
    • + +
  • + + hy_timeout_connect + + + (Any) + + + (defaults to: '10s') + + +
    • + +
  • + + hy_timeout_http_keep_alive + + + (Any) + + + (defaults to: '10s') + + +
    • + +
  • + + hy_timeout_check + + + (Any) + + + (defaults to: '10s') + + +
    • + @@ -546,24 +747,6 @@ disables.

     
 
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
 74
 75
 76
@@ -597,44 +780,83 @@ disables.
    
 104
 105
 106
-107
    +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 - 
    # File 'manifests/params.pp', line 56
+        
    # File 'manifests/params.pp', line 74
 
 class cd_haproxy::params (
 
-$pkg_ensure           = 'latest',
-$reqpackages          = ['haproxy'],
+$pkg_ensure                   = 'latest',
+$reqpackages                  = ['haproxy'],
 
-$hy_host_fqdn         = "proxy.${::domain}",
+$hy_host_fqdn                 = "proxy.${::domain}",
 
 # firewall
-$hy_manage_fw         = true,
-$hy_fw_order_no       = '50',
+$hy_manage_fw                 = true,
+$hy_fw_order_no               = '50',
 
 # main config
-$hy_http_port         = '80',
-$hy_https_port        = '443',
-$hy_chroot            = '/var/lib/haproxy',
-$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_http_port                 = '80',
+$hy_https_port                = '443',
+$hy_chroot                    = '/var/lib/haproxy',
+$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_use_http_server_close     = true,
+$hy_use_forward_for           = true,
+$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_http_keep_alive   = '10s',
+$hy_timeout_check             = '10s',
 
 # user
-$hy_user_name         = 'haproxy',
-$hy_user_comment      = 'haproxy user',
-$hy_user_home         = '/var/lib/haproxy',
-$hy_user_shell        = '/sbin/nologin',
+$hy_user_name                 = 'haproxy',
+$hy_user_comment              = 'haproxy user',
+$hy_user_home                 = '/var/lib/haproxy',
+$hy_user_shell                = '/sbin/nologin',
 
 # logging
-$hy_log_target        = '127.0.0.1',
-$hy_log_facility      = 'local2',
-$hy_log_default       = 'global',
-$hy_use_httplog       = true,
-$hy_use_dontlognull   = true,
+$hy_log_target                = '127.0.0.1',
+$hy_log_facility              = 'local2',
+$hy_log_default               = 'global',
+$hy_use_httplog               = true,
+$hy_use_dontlognull           = true,
 
 ) {
 
@@ -648,7 +870,6 @@ $hy_main_dir          = '/etc/haproxy'
 $hy_main_config       = "${hy_main_dir}/haproxy.cfg"
 $hy_config_head_erb   = 'cd_haproxy/haproxy_head.erb'
 
-
 # includes must be last
 
   include cd_haproxy::main::config