recommit for updates in build 6

2018-12-10 15:58:34 +01:00
parent 5fbbb0ae72
commit 6d7fabe07d
7 changed files with 113 additions and 30 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/19592e5d1921dd6">19592e5d1921dd6</a> Jenkins ConfDroid <i>2018-12-10 13:39:32</i>
+<p>
+<h3>recommit for updates in build 4</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/2f3afa420b80af8">2f3afa420b80af8</a> Arne Teuke <i>2018-12-10 13:36:54</i>
+<p>
+<h3>adds haproxy user</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/672d9954a008213">672d9954a008213</a> Jenkins ConfDroid <i>2018-12-07 14:09:55</i>
 <p>
 <h3>recommit for updates in build 3</h3>
--- 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
--- 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"

 <h3 id="label-Features">Features</h3>

-<p>INSTALLATION * install binaries</p>
+<p>INSTALLATION * install rpm binaries</p>

-<p>CONFIGURATION</p>
+<p>CONFIGURATION * manage haproxy user * manage directories (file system
+permissions, selinux context) * manage files (file system permissions,
+content, selinux context)</p>

-<p>SERVICE * manage service</p>
+<p>SERVICE * manage haproxy service</p>

 <h3 id="label-Repo+Structure">Repo Structure</h3>

@@ -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</a>
 for managing yum base repos</p>
 </li><li>
-<p><a href="https://gitlab.confdroid.com/12WW1160/certbot">cd_certbot</a> for
-automating TLS certificates for https</p>
+<p><a href="https://gitlab.confdroid.com/12ww1160/cd_concat">cd_concat</a> or
+<a href="https://github.com/puppetlabs/puppetlabs-concat">concat</a> for
+managing file fragments</p>
 </li></ul>

 <h3 id="label-Deployment">Deployment</h3>
--- a/doc/index.html
+++ b/doc/index.html
@@ -123,11 +123,13 @@ href="https://gitlab.confdroid.com/12WW1160/cd_haproxy/blob/master/CHANGELOG.md"

 <h3 id="label-Features">Features</h3>

-<p>INSTALLATION * install binaries</p>
+<p>INSTALLATION * install rpm binaries</p>

-<p>CONFIGURATION</p>
+<p>CONFIGURATION * manage haproxy user * manage directories (file system
+permissions, selinux context) * manage files (file system permissions,
+content, selinux context)</p>

-<p>SERVICE * manage service</p>
+<p>SERVICE * manage haproxy service</p>

 <h3 id="label-Repo+Structure">Repo Structure</h3>

@@ -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</a>
 for managing yum base repos</p>
 </li><li>
-<p><a href="https://gitlab.confdroid.com/12WW1160/certbot">cd_certbot</a> for
-automating TLS certificates for https</p>
+<p><a href="https://gitlab.confdroid.com/12ww1160/cd_concat">cd_concat</a> or
+<a href="https://github.com/puppetlabs/puppetlabs-concat">concat</a> for
+managing file fragments</p>
 </li></ul>

 <h3 id="label-Deployment">Deployment</h3>
--- 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</a>/.</p>
 29
 30
 31
-32</pre>
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 23</span>
@@ -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    =&gt;  directory,
+      owner     =&gt;  &#39;root&#39;,
+      group     =&gt;  &#39;root&#39;,
+      mode      =&gt;  &#39;0755&#39;,
+      selrange  =&gt;  s0,
+      selrole   =&gt;  object_r,
+      seltype   =&gt;  etc_t,
+      seluser   =&gt;  system_u,
+    }
  }
-
-
 }</pre>
      </td>
    </tr>
--- 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</a>/.</p>
 27
 28
 29
-30</pre>
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
@@ -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    =&gt;  present,
+      owner     =&gt;  &#39;root&#39;,
+      group     =&gt;  &#39;root&#39;,
+      mode      =&gt;  &#39;0640&#39;,
+      selrange  =&gt;  s0,
+      selrole   =&gt;  object_r,
+      seltype   =&gt;  etc_t,
+      seluser   =&gt;  system_u,
+    }
+
+    # create the header
+    concat::fragment { &#39;header&#39;:
+      target    =&gt;  $hy_main_config,
+      content   =&gt;  $hy_config_head_erb,
+      order     =&gt;  &#39;001&#39;,
+    }
  }
 }</pre>
      </td>
--- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
@@ -395,7 +395,9 @@ to <code>tcp</code>.</p>
 73
 74
 75
-76</pre>
+76
+77
+78</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span>
@@ -427,9 +429,11 @@ $hy_user_shell    = &#39;/sbin/nologin&#39;,
 $hy_service           = &#39;haproxy&#39;

 # directories
-
+$hy_main_dir          = &#39;/etc/haproxy&#39;

 # files
+$hy_main_config       = &quot;${hy_main_dir}/haproxy.cfg&quot;
+$hy_config_head_erb   = &#39;cd_puppet/haproxy_head.erb&#39;


 # includes must be last