From 6d7fabe07d541f4e30e5b1df6b1ca970cd4d7bf2 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Mon, 10 Dec 2018 15:58:34 +0100 Subject: [PATCH] recommit for updates in build 6 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 9 ++++- doc/file.README.html | 13 +++--- doc/index.html | 13 +++--- .../cd_haproxy_3A_3Amain_3A_3Adirs.html | 26 ++++++++++-- .../cd_haproxy_3A_3Amain_3A_3Afiles.html | 40 ++++++++++++++++++- .../cd_haproxy_3A_3Aparams.html | 32 ++++++++------- 7 files changed, 113 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e371168..6d02381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+19592e5d1921dd6 Jenkins ConfDroid 2018-12-10 13:39:32 +

+

recommit for updates in build 4

+ +

+2f3afa420b80af8 Arne Teuke 2018-12-10 13:36:54 +

+

adds haproxy user

+ +

672d9954a008213 Jenkins ConfDroid 2018-12-07 14:09:55

recommit for updates in build 3

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 46aec33..aa858d9 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -14,14 +14,18 @@ | | |-- cd_haproxy_3A_3Amain_3A_3Adirs.html | | |-- cd_haproxy_3A_3Amain_3A_3Afiles.html | | |-- cd_haproxy_3A_3Amain_3A_3Ainstall.html +| | |-- cd_haproxy_3A_3Amain_3A_3Auser.html | | |-- cd_haproxy_3A_3Aparams.html | | |-- cd_haproxy_3A_3Aserver_3A_3Aservice.html | | `-- cd_haproxy.html +| |-- puppet_defined_types +| | `-- cd_haproxy_3A_3Aserver_3A_3Aproxy.html | |-- file.README.html | |-- frames.html | |-- _index.html | |-- index.html | |-- puppet_class_list.html +| |-- puppet_defined_type_list.html | `-- top-level-namespace.html |-- manifests | |-- firewall @@ -38,7 +42,8 @@ | |-- init.pp | `-- params.pp |-- templates -| `-- haproxy.cfg +| |-- haproxy.cfg +| `-- haproxy_head.erb |-- tests | `-- UTF_Files |-- CHANGELOG.md @@ -48,4 +53,4 @@ |-- LICENSE `-- README.md -10 directories, 38 files +11 directories, 42 files diff --git a/doc/file.README.html b/doc/file.README.html index bcbbbc4..30276a5 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -123,11 +123,13 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md"

Features

-

INSTALLATION * install binaries

+

INSTALLATION * install rpm binaries

-

CONFIGURATION

+

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

-

SERVICE * manage service

+

SERVICE * manage haproxy service

Repo Structure

@@ -145,8 +147,9 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md" href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources for managing yum base repos

  • -

    cd_certbot for -automating TLS certificates for https

    +

    cd_concat or +concat for +managing file fragments

    • Deployment

    diff --git a/doc/index.html b/doc/index.html index 7ad3b10..f1bd747 100644 --- a/doc/index.html +++ b/doc/index.html @@ -123,11 +123,13 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md"

    Features

    -

    INSTALLATION * install binaries

    +

    INSTALLATION * install rpm binaries

    -

    CONFIGURATION

    +

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

    -

    SERVICE * manage service

    +

    SERVICE * manage haproxy service

    Repo Structure

    @@ -145,8 +147,9 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md" href="https://gitlab.confdroid.com/12WW1160/cd_resources">cd_resources for managing yum base repos

  • -

    cd_certbot for -automating TLS certificates for https

    +

    cd_concat or +concat for +managing file fragments

    • Deployment

    diff --git a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html index 82a30ae..3288ece 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Adirs.html @@ -125,7 +125,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    29 30 31 -32 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 
    # File 'manifests/main/dirs.pp', line 23
@@ -136,9 +146,19 @@ class cd_haproxy::main::dirs (
 
   if $fqdn == $hy_host_fqdn {
     require cd_haproxy::main::user
+
+    # main dir
+    file { $hy_main_dir:
+      ensure    =>  directory,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0755',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+    }
   }
-
-
 }
    diff --git a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html index 03096fe..0894ccb 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html @@ -123,7 +123,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    27 28 29 -30 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 
    # File 'manifests/main/files.pp', line 23
@@ -134,6 +153,25 @@ class cd_haproxy::main::files (
 
   if $fqdn == $hy_host_fqdn {
     require cd_haproxy::main::dirs
+
+    # create the concat target
+    concat {$hy_main_config:
+      ensure    =>  present,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  etc_t,
+      seluser   =>  system_u,
+    }
+
+    # create the header
+    concat::fragment { 'header':
+      target    =>  $hy_main_config,
+      content   =>  $hy_config_head_erb,
+      order     =>  '001',
+    }
   }
 }
    diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html index 56683bf..de279ad 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html @@ -395,41 +395,45 @@ to tcp.

    73 74 75 -76 +76 +77 +78 
    # File 'manifests/params.pp', line 40
 
 class cd_haproxy::params (
 
-$pkg_ensure       = 'latest',
-$reqpackages      = ['haproxy'],
+$pkg_ensure           = 'latest',
+$reqpackages          = ['haproxy'],
 
-$hy_host_fqdn     = "proxy.${::domain}",
+$hy_host_fqdn         = "proxy.${::domain}",
 
 # firewall
-$hy_manage_fw     = true,
-$hy_fw_order_no   = '50',
+$hy_manage_fw         = true,
+$hy_fw_order_no       = '50',
 
 # main config
-$hy_http_port     = '80',
-$hy_https_port    = '443',
+$hy_http_port         = '80',
+$hy_https_port        = '443',
 
 # user
-$hy_user_name     = 'haproxy',
-$hy_user_comment  = 'haproxy user',
-$hy_user_home     = '/var/lib/haproxy',
-$hy_user_shell    = '/sbin/nologin',
+$hy_user_name         = 'haproxy',
+$hy_user_comment      = 'haproxy user',
+$hy_user_home         = '/var/lib/haproxy',
+$hy_user_shell        = '/sbin/nologin',
 
 ) {
 
 # service
-$hy_service       = 'haproxy'
+$hy_service           = 'haproxy'
 
 # directories
-
+$hy_main_dir          = '/etc/haproxy'
 
 # files
+$hy_main_config       = "${hy_main_dir}/haproxy.cfg"
+$hy_config_head_erb   = 'cd_puppet/haproxy_head.erb'
 
 
 # includes must be last