From c58c8aa1d5f9966a7931077e30a18cb4be9ede1a Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 30 Dec 2018 15:19:18 +0100 Subject: [PATCH] recommit for updates in build 23 --- CHANGELOG.md | 10 ++++++++++ doc/file.README.html | 19 ++++++++++++++++++- doc/index.html | 19 ++++++++++++++++++- .../cd_haproxy_3A_3Aserver_3A_3Aservice.html | 4 +++- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5466aad..5a00117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,20 @@ Changelog of Git Changelog.

No issue

+97cd990da7b1209 Jenkins ConfDroid 2019-12-30 14:03:25 +

+

recommit for updates in build 22

+ +

555513ee781afad Jenkins ConfDroid 2019-12-30 14:02:57

recommit for updates in build 21

+

+0b03adc15aa0e14 Arne Teuke 2019-12-30 14:02:47 +

+

adds acl rule for testing

+

1196f0ed6f7f00d Arne Teuke 2019-12-30 14:02:20

diff --git a/doc/file.README.html b/doc/file.README.html index 30276a5..a3d5984 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -127,7 +127,7 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md"

CONFIGURATION * manage haproxy user * manage directories (file system permissions, selinux context) * manage files (file system permissions, -content, selinux context)

+content, selinux context) * manage proxy instances through a define

SERVICE * manage haproxy service

@@ -191,6 +191,23 @@ should be running. The module will install it only on the host in question.

Optional Parameters

+

Proxy Configuration

+ +

The proxy instances are configured in /etc/haproxy/haproxy.cfg, which is +concatenated from various templates through a define in this puppet module. +In order to create proxy instances, you will need an external class, which +addresses the define, like so:

+ +
cd_haproxy::server::proxy { 'testing':
+    frontend_name   =>  'test01-frontend',
+    acl_rule        =>  'test01-acl',
+    backend_name    =>  'test01-backend',
+  }
+ +

This allows the puppet module to create the sections in the configuration +file as required. The haproxy service will be restarted after the changes +in the configuration file are made.

+

SELINUX

All files and directories are configured with correct selinux context. If diff --git a/doc/index.html b/doc/index.html index f1bd747..349f29c 100644 --- a/doc/index.html +++ b/doc/index.html @@ -127,7 +127,7 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md"

CONFIGURATION * manage haproxy user * manage directories (file system permissions, selinux context) * manage files (file system permissions, -content, selinux context)

+content, selinux context) * manage proxy instances through a define

SERVICE * manage haproxy service

@@ -191,6 +191,23 @@ should be running. The module will install it only on the host in question.

Optional Parameters

+

Proxy Configuration

+ +

The proxy instances are configured in /etc/haproxy/haproxy.cfg, which is +concatenated from various templates through a define in this puppet module. +In order to create proxy instances, you will need an external class, which +addresses the define, like so:

+ +
cd_haproxy::server::proxy { 'testing':
+    frontend_name   =>  'test01-frontend',
+    acl_rule        =>  'test01-acl',
+    backend_name    =>  'test01-backend',
+  }
+ +

This allows the puppet module to create the sections in the configuration +file as required. The haproxy service will be restarted after the changes +in the configuration file are made.

+

SELINUX

All files and directories are configured with correct selinux context. If diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aservice.html index cf281a5..2370f81 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aservice.html @@ -131,7 +131,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

35 36 37 -38 +38 +39 
# File 'manifests/server/service.pp', line 23
@@ -149,6 +150,7 @@ class cd_haproxy::server::service (
       hasstatus   => true,
       hasrestart  => true,
       enable      => true,
+      subscribe   => $hy_main_config,
     }
   }
 }