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

No issue

+f0380992ba53b31 Jenkins ConfDroid 2018-12-10 15:10:37 +

+

recommit for updates in build 7

+ +

+5dbc4aa1ae0f6b9 Arne Teuke 2018-12-10 15:09:52 +

+

fixes user settings

+ +

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

recommit for updates in build 6

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html index 0894ccb..9659ef5 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html @@ -169,7 +169,7 @@ class cd_haproxy::main::files ( # create the header concat::fragment { 'header': target => $hy_main_config, - content => $hy_config_head_erb, + content => template($hy_config_head_erb), order => '001', } } diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index 9f69d30..ba4fb76 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -260,12 +260,17 @@ fqdns via array.

hy_user_name - (Any) + (string) (defaults to: 'haproxy') + — +
+

the name of the haproxy service user.

+
+
  • @@ -273,12 +278,35 @@ fqdns via array.

    hy_user_comment - (Any) + (string) (defaults to: 'haproxy user') + — +
    +

    the comment of the haproxy user, shows up in emails sent from haproxy.

    +
    + +
  • + +
  • + + hy_user_shell + + + (string) + + + (defaults to: '/sbin/nologin') + + + — +
    +

    the shell for the haproxy user.

    +
    +
  • @@ -294,19 +322,6 @@ fqdns via array.

  • -
  • - - hy_user_shell - - - (Any) - - - (defaults to: '/sbin/nologin') - - -
  • - @@ -317,10 +332,6 @@ fqdns via array.

     
     
    -35
    -36
    -37
    -38
     39
     40
     41
    @@ -355,10 +366,14 @@ fqdns via array.

    70 71 72 -73
    +73 +74 +75 +76 +77 -
    # File 'manifests/params.pp', line 35
    +        
    # File 'manifests/params.pp', line 39
     
     class cd_haproxy::params (
     
    @@ -391,7 +406,7 @@ $hy_main_dir          = '/etc/haproxy'
     
     # files
     $hy_main_config       = "${hy_main_dir}/haproxy.cfg"
    -$hy_config_head_erb   = 'cd_puppet/haproxy_head.erb'
    +$hy_config_head_erb   = 'cd_haproxy/haproxy_head.erb'
     
     
     # includes must be last