From df9f3ad3eface58581b8c1a4093b553fcc63345b Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sat, 29 Dec 2018 19:21:11 +0100 Subject: [PATCH] recommit for updates in build 13 --- CHANGELOG.md | 10 +++ REPOSTRUCTURE.md | 5 +- .../cd_haproxy_3A_3Aserver_3A_3Aproxy.html | 78 +++++++++++++++++-- 3 files changed, 84 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a127804..8781d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+e947028d184999c Jenkins ConfDroid 2018-12-24 15:51:39 +

+

recommit for updates in build 12

+ +

+f5c158000eea623 Arne Teuke 2018-12-24 15:51:00 +

+

updates template

+ +

dde6c78663accbf Jenkins ConfDroid 2018-12-19 15:08:40

recommit for updates in build 11

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index aa858d9..0426fe4 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -42,7 +42,10 @@ | |-- init.pp | `-- params.pp |-- templates +| |-- haproxy_acl_rule.erb +| |-- haproxy_backend_rule.erb | |-- haproxy.cfg +| |-- haproxy_frontend_rule.erb | `-- haproxy_head.erb |-- tests | `-- UTF_Files @@ -53,4 +56,4 @@ |-- LICENSE `-- README.md -11 directories, 42 files +11 directories, 45 files 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 79aa436..28741ee 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 @@ -104,7 +104,47 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

+

Parameters:

+ +
@@ -113,24 +153,46 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 
 
-23
-24
-25
 26
 27
 28
-29
+29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43
-
# File 'manifests/server/proxy.pp', line 23
+        
# File 'manifests/server/proxy.pp', line 26
 
-define cd_haproxy::server::proxy (
+define cd_haproxy::server::proxy (
 
-) {
+$frontend_name    = undef,
+$frontend_order   = undef,
 
+) {
 
+$hy_main_config   = cd_haproxy::params::hy_main_config
+$hy_frontendrule  = 'cd_haproxy/haproxy_frontend_rule.erb'
 
-}
+ # create frontend section + concat::fragment { "frontend_${name}": + target => $hy_main_config, + content => $hy_frontendrule, + order => $frontend_order, + } + +}