From 8e5168e7bd446e3677ceaa45894d10f35be501cb Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 18 Dec 2018 16:23:43 +0100 Subject: [PATCH] recommit for updates in build 10 --- CHANGELOG.md | 10 ++++++ .../cd_haproxy_3A_3Aparams.html | 36 ++++++++++++++----- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf4b68b..195d7bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+67ebcc2a6507cdd Jenkins ConfDroid 2018-12-10 15:58:41 +

+

recommit for updates in build 9

+ +

+d4048ab4716bc91 Arne Teuke 2018-12-10 15:57:53 +

+

adds global section

+ +

6bed2aaed91dec8 Jenkins ConfDroid 2018-12-10 15:22:32

recommit for updates in build 8

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index d44554d..580d058 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -450,6 +450,24 @@ rsyslog forwarding supported.

name and path of the stats socket

+
+ + + +
  • + + hy_default_mode + + + (string) + + + (defaults to: 'http') + + + — +
    +

    which mode to use in the defaults block

  • @@ -464,7 +482,6 @@ rsyslog forwarding supported.

     
     
    -48
     49
     50
     51
    @@ -511,10 +528,12 @@ rsyslog forwarding supported.

    92 93 94 -95
    +95 +96 +97 -
    # File 'manifests/params.pp', line 48
    +        
    # File 'manifests/params.pp', line 49
     
     class cd_haproxy::params (
     
    @@ -530,6 +549,12 @@ $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',
     
     # user
     $hy_user_name         = 'haproxy',
    @@ -540,11 +565,6 @@ $hy_user_shell        = '/sbin/nologin',
     # logging
     $hy_log_target        = '127.0.0.1',
     $hy_log_facility      = 'local2',
    -$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',
     
     ) {