From 6bed2aaed91dec8090d84452e04c63abf87fe1ba Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid <jenkins@confdroid.com>
Date: Mon, 10 Dec 2018 16:22:32 +0100
Subject: [PATCH] recommit for updates in build 8

---
 CHANGELOG.md                                  | 10 ++++
 .../cd_haproxy_3A_3Amain_3A_3Afiles.html      |  2 +-
 .../cd_haproxy_3A_3Aparams.html               | 59 ++++++++++++-------
 3 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4174012..07474d2 100644
--- 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/f0380992ba53b31">f0380992ba53b31</a> Jenkins ConfDroid <i>2018-12-10 15:10:37</i>
+<p>
+<h3>recommit for updates in build 7</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/5dbc4aa1ae0f6b9">5dbc4aa1ae0f6b9</a> Arne Teuke <i>2018-12-10 15:09:52</i>
+<p>
+<h3>fixes user settings</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/6d7fabe07d541f4">6d7fabe07d541f4</a> Jenkins ConfDroid <i>2018-12-10 14:58:34</i>
 <p>
 <h3>recommit for updates in build 6</h3>
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 0894ccb..9659ef5 100644
--- a/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_haproxy_3A_3Amain_3A_3Afiles.html
@@ -169,7 +169,7 @@ class cd_haproxy::main::files (
     # create the header
     concat::fragment { &#39;header&#39;:
       target    =&gt;  $hy_main_config,
-      content   =&gt;  $hy_config_head_erb,
+      content   =&gt;  template($hy_config_head_erb),
       order     =&gt;  &#39;001&#39;,
     }
   }
diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
index 9f69d30..ba4fb76 100644
--- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
@@ -260,12 +260,17 @@ fqdns via array.</p>
         <span class='name'>hy_user_name</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>&#39;haproxy&#39;</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>the name of the haproxy service user.</p>
+</div>
+      
     </li>
   
     <li>
@@ -273,12 +278,35 @@ fqdns via array.</p>
         <span class='name'>hy_user_comment</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>&#39;haproxy user&#39;</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>the comment of the haproxy user, shows up in emails sent from haproxy.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>hy_user_shell</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the shell for the haproxy user.</p>
+</div>
+      
     </li>
   
     <li>
@@ -294,19 +322,6 @@ fqdns via array.</p>
       
     </li>
   
-    <li>
-      
-        <span class='name'>hy_user_shell</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
-      
-      
-    </li>
-  
 </ul>
 
 
@@ -317,10 +332,6 @@ fqdns via array.</p>
         <pre class="lines">
 
 
-35
-36
-37
-38
 39
 40
 41
@@ -355,10 +366,14 @@ fqdns via array.</p>
 70
 71
 72
-73</pre>
+73
+74
+75
+76
+77</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 35</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 39</span>
 
 class cd_haproxy::params (
 
@@ -391,7 +406,7 @@ $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;
+$hy_config_head_erb   = &#39;cd_haproxy/haproxy_head.erb&#39;
 
 
 # includes must be last