diff --git a/CHANGELOG.md b/CHANGELOG.md index 3342fa9..c74ce96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+87603c49c746a9a Jenkins ConfDroid 2019-12-30 16:17:56 +

+

recommit for updates in build 41

+ +

+6ecca6ef59e5087 Arne Teuke 2019-12-30 16:17:19 +

+

updates README

+ +

1ef93c6e81f9820 Jenkins ConfDroid 2019-12-30 16:13:15

recommit for updates in build 40

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 02cd692..f325c24 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -44,6 +44,14 @@ | |-- init.pp | `-- params.pp |-- templates +| |-- errors +| | |-- 400_http.erb +| | |-- 403_http.erb +| | |-- 408_http.erb +| | |-- 500_http.erb +| | |-- 502_http.erb +| | |-- 503_http.erb +| | `-- 504_http.erb | |-- haproxy_acl_rule.erb | |-- haproxy_backend_rule.erb | |-- haproxy.cfg @@ -58,4 +66,4 @@ |-- LICENSE `-- README.md -11 directories, 47 files +12 directories, 54 files diff --git a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html index 3288ece..94fe58b 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html @@ -135,7 +135,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

39 40 41 -42 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54
# File 'manifests/main/dirs.pp', line 23
@@ -158,6 +170,18 @@ class cd_haproxy::main::dirs (
       seltype   =>  etc_t,
       seluser   =>  system_u,
     }
+
+    # errors dir
+    file { $hy_errors_dir:
+      ensure    =>  directory,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0755',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+    }
   }
 }
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 d28ef58..831ce42 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html @@ -155,7 +155,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

59 60 61 -62 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77
# File 'manifests/main/files.pp', line 23
@@ -198,6 +213,21 @@ class cd_haproxy::main::files (
       seltype   =>  haproxy_var_run_t,
       seluser   =>  system_u,
     }
+
+    # error files
+    file { $hy_400_file:
+      ensure    =>  file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+      content   =>  template($hy_400_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 5a99225..a4fb124 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -810,7 +810,10 @@ succeed.

132 133 134 -135 +135 +136 +137 +138
# File 'manifests/params.pp', line 74
@@ -867,10 +870,13 @@ $hy_service           = 'haproxy'
 
 # directories
 $hy_main_dir          = '/etc/haproxy'
+$hy_errors_dir        = "${hy_main_dir}/errors"
 
 # files
 $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/400_http.erb'
 
 # includes must be last