From dde6c78663accbf98c1987a6af82d630658c28c4 Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid <jenkins@confdroid.com>
Date: Wed, 19 Dec 2018 16:08:40 +0100
Subject: [PATCH] recommit for updates in build 11

---
 CHANGELOG.md                                  | 10 +++
 .../cd_haproxy_3A_3Aparams.html               | 88 +++++++++++++++++--
 .../cd_haproxy_3A_3Aserver_3A_3Aproxy.html    |  6 +-
 3 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 195d7bc..eb03f4f 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/8e5168e7bd446e3">8e5168e7bd446e3</a> Jenkins ConfDroid <i>2018-12-18 15:23:43</i>
+<p>
+<h3>recommit for updates in build 10</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/b1bd401033fc004">b1bd401033fc004</a> Arne Teuke <i>2018-12-18 15:23:09</i>
+<p>
+<h3>adds templates</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/67ebcc2a6507cdd">67ebcc2a6507cdd</a> Jenkins ConfDroid <i>2018-12-10 15:58:41</i>
 <p>
 <h3>recommit for updates in build 9</h3>
diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
index 580d058..1aacff7 100644
--- a/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_haproxy_3A_3Aparams.html
@@ -468,6 +468,63 @@ rsyslog forwarding supported.</p>
         &mdash;
         <div class='inline'>
 <p>which mode to use in the defaults block</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>hy_log_default</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;global&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>should be used when the instance&#39;s logging parameters are the same as
+the global ones.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>hy_use_httplog</span>
+      
+      
+        <span class='type'>(<tt>boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to use httplogging option. Enable logging of HTTP request, session
+state and timers</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>hy_use_dontlognull</span>
+      
+      
+        <span class='type'>(<tt>boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to enable or disable dontlognull option. true enables, false
+disables.</p>
 </div>
       
     </li>
@@ -475,6 +532,13 @@ rsyslog forwarding supported.</p>
 </ul>
 
 
+  <p class="tag_title">See Also:</p>
+  <ul class="see">
+    
+      <li><a href="https://cbonte.github.io/haproxy-dconv/1.5/configuration.html" target="_parent" title="https://cbonte.github.io/haproxy-dconv/1.5/configuration.html">https://cbonte.github.io/haproxy-dconv/1.5/configuration.html</a></li>
+    
+  </ul>
+
 </div><div class="method_details_list">
   <table class="source_code">
     <tr>
@@ -482,13 +546,6 @@ rsyslog forwarding supported.</p>
         <pre class="lines">
 
 
-49
-50
-51
-52
-53
-54
-55
 56
 57
 58
@@ -530,10 +587,20 @@ rsyslog forwarding supported.</p>
 94
 95
 96
-97</pre>
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 49</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 56</span>
 
 class cd_haproxy::params (
 
@@ -565,6 +632,9 @@ $hy_user_shell        = &#39;/sbin/nologin&#39;,
 # logging
 $hy_log_target        = &#39;127.0.0.1&#39;,
 $hy_log_facility      = &#39;local2&#39;,
+$hy_log_default       = &#39;global&#39;,
+$hy_use_httplog       = true,
+$hy_use_dontlognull   = true,
 
 ) {
 
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 2d173ce..79aa436 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
@@ -117,7 +117,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 24
 25
 26
-27</pre>
+27
+28
+29</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 23</span>
@@ -126,6 +128,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 
 <span class='rparen'>)</span> <span class='lbrace'>{</span>
 
+
+
 <span class='rbrace'>}</span></pre>
       </td>
     </tr>