From 1bc2e5fc0ab9b62c6277a2ab864255b9770144b3 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 30 Dec 2018 18:39:35 +0100 Subject: [PATCH] recommit for updates in build 49 --- CHANGELOG.md | 10 ++ .../cd_haproxy_3A_3Amain_3A_3Afiles.html | 156 +++++++++++++++++- .../cd_haproxy_3A_3Aparams.html | 26 ++- 3 files changed, 190 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c1fa69..3299744 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+4f87b202d902e72 Jenkins ConfDroid 2019-12-30 17:32:21 +

+

recommit for updates in build 48

+ +

+dd61cd7f9df8a29 Arne Teuke 2019-12-30 17:31:41 +

+

host binding via fqdn works

+ +

c032fa01bd70a77 Jenkins ConfDroid 2019-12-30 17:22:59

recommit for updates in build 47

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 831ce42..7de5c7d 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html @@ -170,7 +170,84 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

74 75 76 -77 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +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 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 
# File 'manifests/main/files.pp', line 23
@@ -228,6 +305,83 @@ class cd_haproxy::main::files (
       notify    =>  Service[$hy_service],
     }
 
+    file { $hy_403_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_403_erb),
+      notify    =>  Service[$hy_service],
+    }
+
+    file { $hy_408_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_408_erb),
+      notify    =>  Service[$hy_service],
+    }
+
+    file { $hy_500_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_500_erb),
+      notify    =>  Service[$hy_service],
+    }
+
+    file { $hy_502_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_502_erb),
+      notify    =>  Service[$hy_service],
+    }
+
+    file { $hy_503_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_503_erb),
+      notify    =>  Service[$hy_service],
+    }
+
+    file { $hy_504_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_504_erb),
+      notify    =>  Service[$hy_service],
+    }
   }
 }
diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index bad696e..26b9ba5 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -813,7 +813,19 @@ succeed.

135 136 137 -138 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 
# File 'manifests/params.pp', line 74
@@ -877,6 +889,18 @@ $hy_main_config       = "${hy_main_dir}/haproxy.cfg"
 $hy_config_head_erb   = 'cd_haproxy/haproxy_head.erb'
 $hy_400_file          = "${hy_errors_dir}/400.http"
 $hy_400_erb           = 'cd_haproxy/errors/400_http.erb'
+$hy_403_file          = "${hy_errors_dir}/403.http"
+$hy_403_erb           = 'cd_haproxy/errors/403_http.erb'
+$hy_408_file          = "${hy_errors_dir}/408.http"
+$hy_408_erb           = 'cd_haproxy/errors/408_http.erb'
+$hy_500_file          = "${hy_errors_dir}/500.http"
+$hy_500_erb           = 'cd_haproxy/errors/500_http.erb'
+$hy_502_file          = "${hy_errors_dir}/502.http"
+$hy_502_erb           = 'cd_haproxy/errors/502_http.erb'
+$hy_503_file          = "${hy_errors_dir}/503.http"
+$hy_503_erb           = 'cd_haproxy/errors/503_http.erb'
+$hy_504_file          = "${hy_errors_dir}/504.http"
+$hy_504_erb           = 'cd_haproxy/errors/504_http.erb'
 
 # includes must be last