From f0380992ba53b319f095b4df358cf950e3bad822 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Mon, 10 Dec 2018 16:10:37 +0100 Subject: [PATCH] recommit for updates in build 7 --- CHANGELOG.md | 15 ++++ .../cd_haproxy_3A_3Amain_3A_3Auser.html | 10 +-- .../cd_haproxy_3A_3Aparams.html | 80 +++++-------------- 3 files changed, 39 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d02381..4174012 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+6d7fabe07d541f4 Jenkins ConfDroid 2018-12-10 14:58:34 +

+

recommit for updates in build 6

+ +

+7b396df49ec0c21 Arne Teuke 2018-12-10 14:57:50 +

+

creates the main conffig target and header

+ +

+e64adc8f82410f0 Arne Teuke 2018-12-10 14:56:28 +

+

creates the main conffig target and header

+ +

19592e5d1921dd6 Jenkins ConfDroid 2018-12-10 13:39:32

recommit for updates in build 4

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Auser.html index 306588f..d1f0428 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Auser.html @@ -158,20 +158,20 @@ class cd_haproxy::main::user ( require cd_haproxy::main::install # manage user - user { $hy_user: + user { $hy_user_name: ensure => present, - name => $hy_user, + name => $hy_user_name, allowdupe => false, comment => $hy_user_comment, - gid => $hy_user, + gid => $hy_user_name, managehome => true, home => $hy_user_home, shell => $hy_user_shell, } - group { $hy_user: + group { $hy_user_name: ensure => present, - name => $hy_user, + name => $hy_user_name, allowdupe => false, } } diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index de279ad..9f69d30 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -219,69 +219,22 @@ fqdns via array.

-
  • - - hy_proxy_mode - - - (string) - - - - — -
    -

    which mode the ha proxy should work in. Valid oprtions are -http and tcp.

    -
    - -
    • - -
  • - - hy_fe_port - - - (string) - - - - — -
    -

    the frontend port to list to. opens in firewall, if enabled, and is used in -configuration templates. only active if hy_proxy_mode is set -to tcp.

    -
    - -
    • - -
  • - - hy_be_port - - - (string) - - - - — -
    -

    the backend port to send traffic through. only active if -hy_proxy_mode is set to tcp.

    -
    - -
    • -
  • hy_http_port - (Any) + (string) (defaults to: '80') + — +
    +

    the http port. used in firewall settings

    +
    +
  • @@ -289,12 +242,17 @@ to tcp.

    hy_https_port - (Any) + (string) (defaults to: '443') + — +
    +

    the https port. used in firewall settings

    +
    +
  • @@ -359,6 +317,11 @@ to tcp.

     
 
+35
+36
+37
+38
+39
 40
 41
 42
@@ -392,15 +355,10 @@ to tcp.
    
 70
 71
 72
-73
-74
-75
-76
-77
-78
    +73 - 
    # File 'manifests/params.pp', line 40
+        
    # File 'manifests/params.pp', line 35
 
 class cd_haproxy::params (