From 3b005f04a4e82e620d54e4aa08128bb0e3f3d64f Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid
Date: Sat, 29 Dec 2018 19:44:26 +0100
Subject: [PATCH] recommit for updates in build 17
---
CHANGELOG.md | 10 ++++++++++
.../cd_haproxy_3A_3Aserver_3A_3Aproxy.html | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 423967c..0e7d25c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
No issue
+958d0fbfb0717bc Jenkins ConfDroid 2018-12-29 18:41:00
+
+
recommit for updates in build 16
+
+
+542577c35cc2f46 Arne Teuke 2018-12-29 18:40:26
+
+
adding template for testing
+
+
cfcd67e63ae3c92 Jenkins ConfDroid 2018-12-29 18:37:04
recommit for updates in build 15
diff --git a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
index 829f1c1..8970bc8 100644
--- a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
+++ b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
@@ -182,7 +182,7 @@ $frontend_order = '010',
) {
-$hy_main_config = cd_haproxy::params::hy_main_config
+$hy_main_config = '/etc/haproxy/haproxy.cfg'
$hy_frontendrule = 'cd_haproxy/haproxy_frontend_rule.erb'
# create frontend section