From 747a55d98af6f0476550561be3c886982fcf3956 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 30 Dec 2018 18:12:16 +0100 Subject: [PATCH] recommit for updates in build 43 --- CHANGELOG.md | 10 ++++++++++ doc/puppet_classes/cd_haproxy_3A_3Aparams.html | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c74ce96..754570c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+6b257cb39a01c7b Jenkins ConfDroid 2019-12-30 16:51:20 +

+

recommit for updates in build 42

+ +

+5170181c506500f Arne Teuke 2019-12-30 16:50:39 +

+

adds directory control for errors

+ +

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

recommit for updates in build 41

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index a4fb124..bad696e 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -876,7 +876,7 @@ $hy_errors_dir = "${hy_main_dir}/errors" $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' +$hy_400_erb = 'cd_haproxy/errors/400_http.erb' # includes must be last