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

No issue

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

+

recommit for updates in build 19

+ +

+e91d4d6808c3f08 Arne Teuke 2018-12-29 18:54:41 +

+

adding backend template for testing

+ +

2222c8139395f02 Jenkins ConfDroid 2018-12-29 18:47:43

recommit for updates in build 18

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html index 963b53d..dac0ba2 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html @@ -140,9 +140,9 @@ class cd_haproxy::server::proxy_test ( cd_haproxy::server::proxy { 'testing': frontend_name => 'test01-frontend', + acl_rule => 'test01-acl', backend_name => 'test01-backend', } - } 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 67e00a2..f62bac6 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 @@ -141,6 +141,32 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

the order where the concet should appear in the file.

+ + +
  • + + acl_rule + + + (Any) + + + (defaults to: undef) + + +
  • + +
  • + + acl_order + + + (Any) + + + (defaults to: '20') + +
  • @@ -164,7 +190,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    (Any) - (defaults to: '020') + (defaults to: '030')
  • @@ -206,7 +232,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    50 51 52 -53 +53 +54 +55 +56 +57 +58 +59 +60 +61
    # File 'manifests/server/proxy.pp', line 26
    @@ -215,14 +249,17 @@ define cd_haproxy::server::proxy (
     
     $frontend_name    = undef,
     $frontend_order   = '010',
    +$acl_rule         = undef,
    +$acl_order        = '20',
     $backend_name     = undef,
    -$backend_order    = '020',
    +$backend_order    = '030',
     
     ) {
     
     $hy_main_config   = '/etc/haproxy/haproxy.cfg'
     $hy_frontendrule  = 'cd_haproxy/haproxy_frontend_rule.erb'
     $hy_backendrule   = 'cd_haproxy/haproxy_backend_rule.erb'
    +$hy_acl_rule      = 'cd_haproxy/haproxy_acl_rule.erb'
     
       # create frontend section
       concat::fragment { "frontend_${name}":
    @@ -231,13 +268,18 @@ $hy_backendrule   = 'cd_haproxy/haproxy_backend_rule.erb'
         order   =>  $frontend_order,
       }
     
    +  # create acl section
    +  concat::fragment { "acl_${name}":
    +    target  =>  $hy_main_config,
    +    content =>  template($hy_acl_rule),
    +  }
    +
       # create backend section
       concat::fragment { "backend_${name}":
         target  =>  $hy_main_config,
         content =>  template($hy_backendrule),
         order   =>  $backend_order,
       }
    -
     }