From 67ebcc2a6507cdd053dba1fa47ad9c6c689d6262 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Mon, 10 Dec 2018 16:58:41 +0100 Subject: [PATCH] recommit for updates in build 9 --- CHANGELOG.md | 15 ++ .../cd_haproxy_3A_3Amain_3A_3Afiles.html | 26 ++- .../cd_haproxy_3A_3Aparams.html | 176 ++++++++++++++++-- 3 files changed, 203 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07474d2..bf4b68b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 8

+ +

+144913bdb43acdc Arne Teuke 2018-12-10 15:21:45 +

+

adds parameter documentations

+ +

+f95359166b201a8 Arne Teuke 2018-12-10 15:12:32 +

+

adds parameter documentations

+ +

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

recommit for updates in build 7

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 9659ef5..8f31b81 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html @@ -142,7 +142,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

46 47 48 -49 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 
# File 'manifests/main/files.pp', line 23
@@ -172,6 +184,18 @@ class cd_haproxy::main::files (
       content   =>  template($hy_config_head_erb),
       order     =>  '001',
     }
+
+    # pid file
+    file { $hy_pid:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  haproxy_var_run_t,
+      seluser   =>  system_u,
+    }
   }
 }
diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index ba4fb76..d44554d 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -291,6 +291,24 @@ fqdns via array.

+
  • + + hy_user_home + + + (string) + + + (defaults to: '/var/lib/haproxy') + + + — +
    +

    the home directory for the haprxy user.

    +
    + +
    • +
  • hy_user_shell @@ -311,15 +329,129 @@ fqdns via array.

  • - hy_user_home + hy_log_target - (Any) + (string) + + + (defaults to: '127.0.0.1') + + + — +
    +

    Where to send the logs for this haproxy. Currently only local logging / +rsyslog forwarding supported.

    +
    + +
    • + +
  • + + hy_log_facility + + + (string) + + + (defaults to: 'local2') + + + — +
    +

    which logging facility to use.

    +
    + +
    • + +
  • + + hy_chroot + + + (string) (defaults to: '/var/lib/haproxy') + — +
    +

    where the chroot should be

    +
    + +
    • + +
  • + + hy_pid + + + (string) + + + (defaults to: '/var/run/haproxy.pid') + + + — +
    +

    the pid file to use.

    +
    + +
    • + +
  • + + hy_maxconn + + + (string) + + + (defaults to: '4000') + + + — +
    +

    how many connections should we max allow.

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

    whether we want to display the statistics page

    +
    + +
    • + +
  • + + hy_stats_socket + + + (string) + + + (defaults to: '/var/lib/haproxy/stats') + + + — +
    +

    name and path of the stats socket

    +
    +
    • @@ -332,15 +464,6 @@ fqdns via array.

     
 
-39
-40
-41
-42
-43
-44
-45
-46
-47
 48
 49
 50
@@ -370,10 +493,28 @@ fqdns via array.
    
 74
 75
 76
-77
    +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 - 
    # File 'manifests/params.pp', line 39
+        
    # File 'manifests/params.pp', line 48
 
 class cd_haproxy::params (
 
@@ -396,6 +537,15 @@ $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_chroot            = '/var/lib/haproxy',
+$hy_pid               = '/var/run/haproxy.pid',
+$hy_maxconn           = '4000',
+$hy_show_stats        = true,
+$hy_stats_socket      = '/var/lib/haproxy/stats',
+
 ) {
 
 # service