From 555513ee781afad523fcf0420a1e7585f66f165d Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 30 Dec 2018 15:02:57 +0100 Subject: [PATCH] recommit for updates in build 21 --- CHANGELOG.md | 10 ++++++++++ .../cd_haproxy_3A_3Aserver_3A_3Aproxy.html | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c37dfe8..dd8c9ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+a7f0534963eca2d Jenkins ConfDroid 2019-12-30 13:57:34 +

+

recommit for updates in build 20

+ +

+3d1c714cf54febf Arne Teuke 2019-12-30 13:56:57 +

+

adds acl rule for testing

+ +

091d948219e7b0a Jenkins ConfDroid 2018-12-29 18:55:18

recommit for updates in build 19

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 f62bac6..ce91990 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 @@ -240,7 +240,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

58 59 60 -61 +61 +62
# File 'manifests/server/proxy.pp', line 26
@@ -272,6 +273,7 @@ $hy_acl_rule      = 'cd_haproxy/haproxy_acl_rule.erb'
   concat::fragment { "acl_${name}":
     target  =>  $hy_main_config,
     content =>  template($hy_acl_rule),
+    order   =>  $acl_order,
   }
 
   # create backend section