From 0e3494abca5e62e6a372186192698d5239807ea4 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 30 Dec 2018 15:50:59 +0100 Subject: [PATCH] recommit for updates in build 26 --- CHANGELOG.md | 10 ++++++ doc/file.README.html | 5 +-- doc/index.html | 5 +-- ...d_haproxy_3A_3Aserver_3A_3Aproxy_test.html | 6 +++- .../cd_haproxy_3A_3Aserver_3A_3Aproxy.html | 32 ++++++++++++++++++- 5 files changed, 52 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa72681..e9886ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+da57b688881c681 Jenkins ConfDroid 2019-12-30 14:32:28 +

+

recommit for updates in build 25

+ +

+29176542429ddaf Arne Teuke 2019-12-30 14:31:50 +

+

adds service control and updates README

+ +

eb4cb755c039b7e Jenkins ConfDroid 2019-12-30 14:29:49

recommit for updates in build 24

diff --git a/doc/file.README.html b/doc/file.README.html index a3d5984..8256f7d 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -59,7 +59,7 @@

|Repo Name| version | Build Status| |—|—|—|—| |cd_haproxy| -1.0.0.0 | |

Synopsis

@@ -129,7 +129,8 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md" permissions, selinux context) * manage files (file system permissions, content, selinux context) * manage proxy instances through a define

-

SERVICE * manage haproxy service

+

SERVICE * manage haproxy service * restart service after changes in the +configuration

Repo Structure

diff --git a/doc/index.html b/doc/index.html index 349f29c..3d6f3c4 100644 --- a/doc/index.html +++ b/doc/index.html @@ -59,7 +59,7 @@

|Repo Name| version | Build Status| |—|—|—|—| |cd_haproxy| -1.0.0.0 | |

Synopsis

@@ -129,7 +129,8 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md" permissions, selinux context) * manage files (file system permissions, content, selinux context) * manage proxy instances through a define

-

SERVICE * manage haproxy service

+

SERVICE * manage haproxy service * restart service after changes in the +configuration

Repo Structure

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 dac0ba2..5758378 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 @@ -129,7 +129,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

29 30 31 -32 +32 +33 +34 
# File 'manifests/server/proxy_test.pp', line 23
@@ -140,6 +142,8 @@ class cd_haproxy::server::proxy_test (
 
   cd_haproxy::server::proxy { 'testing':
     frontend_name   =>  'test01-frontend',
+    frontend_mode   =>  'http',
+    fe_use_backend  =>  "${backend_name}",
     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 52bb569..c36ad01 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.
+ + +
  • + + frontend_mode + + + (Any) + + + (defaults to: undef) + + +
    • + +
  • + + fe_use_backend + + + (Any) + + + (defaults to: undef) + +
  • @@ -241,7 +267,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    59 60 61 -62 +62 +63 +64 
    # File 'manifests/server/proxy.pp', line 26
@@ -249,6 +277,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 define cd_haproxy::server::proxy (
 
 $frontend_name    = undef,
+$frontend_mode    = undef,
+$fe_use_backend   = undef,
 $frontend_order   = '010',
 $acl_rule         = undef,
 $acl_order        = '020',