recommit for updates in build 54

2019-01-07 20:02:42 +01:00
parent 3a27af98da
commit d7847f62c2
3 changed files with 129 additions and 38 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/2f63ab557e78421">2f63ab557e78421</a> Jenkins ConfDroid <i>2019-12-31 17:25:35</i>
+<p>
+<h3>recommit for updates in build 52</h3>
+
+</p>
+<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/0f6f603f8fbd99e">0f6f603f8fbd99e</a> Arne Teuke <i>2019-12-31 17:24:58</i>
+<p>
+<h3>updates README</h3>
+
+</p>
 <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/30f1e87f133fd3a">30f1e87f133fd3a</a> Jenkins ConfDroid <i>2019-12-31 17:22:54</i>
 <p>
 <h3>recommit for updates in build 51</h3>
--- a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html
+++ b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html
@@ -132,7 +132,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 32
 33
 34
-35</pre>
+35
+36</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/proxy_test.pp', line 23</span>
@@ -148,6 +149,7 @@ class cd_haproxy::server::proxy_test (
    acl_rule        =&gt;  [&#39;too_fast fe_sess_rate ge 10&#39;,
                        &#39;network_allowed src 0.0.0.0/0&#39;],
    backend_name    =&gt;  &#39;test01-backend&#39;,
+    be_server_name  =&gt;  [&#39;web01&#39;, &#39;web02&#39;],
  }
 }</pre>
      </td>
--- a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
+++ b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
@@ -107,6 +107,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
  <p class="tag_title">Parameters:</p>
 <ul class="param">
  
+    <li>
+      
+        <span class='name'>haproxy_fqdn</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the fqdn of the haproxy server in question.</p>
+</div>
+      
+    </li>
+  
    <li>
      
        <span class='name'>frontend_name</span>
@@ -138,22 +156,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
      
        &mdash;
        <div class='inline'>
-<p>the order where the concet should appear in the file.</p>
+<p>the order where the concat should appear in the file.</p>
 </div>
      
-    </li>
-  
-    <li>
-      
-        <span class='name'>haproxy_fqdn</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>undef</tt>)</em>
-      
-      
    </li>
  
    <li>
@@ -161,12 +166,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>frontend_mode</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>undef</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>mode for the loadbalancer instance: http or tcp</p>
+</div>
+      
    </li>
  
    <li>
@@ -174,12 +184,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>fe_use_backend</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>which backend to use. if left empty, the default backend will be used.</p>
+</div>
+      
    </li>
  
    <li>
@@ -187,12 +202,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>fe_bind_mode</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>&#39;*:80&#39;</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>which bind mode to use, i.e. to which interface and poort to bind.</p>
+</div>
+      
    </li>
  
    <li>
@@ -200,12 +220,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>acl_rule</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>an ACL rule to be inserted if required. Empty values will not be populated.</p>
+</div>
+      
    </li>
  
    <li>
@@ -213,12 +238,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>acl_order</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>&#39;020&#39;</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>the order where the acl rule should be inserted, so it will be within the
+correct lb instance configuration.</p>
+</div>
+      
    </li>
  
    <li>
@@ -226,12 +257,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>backend_name</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>undef</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>the backend name to be used for the rule.</p>
+</div>
+      
    </li>
  
    <li>
@@ -239,12 +275,49 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <span class='name'>backend_order</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>&#39;030&#39;</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>the order for the backend name, so it will be within the correct lb
+instance configuration.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fe_maxconn</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the maximum connections for the lb instance.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>be_server_name</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
    </li>
  
 </ul>
@@ -257,20 +330,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <pre class="lines">


-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
 40
 41
 42
@@ -297,10 +356,27 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 63
 64
 65
-66</pre>
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 26</span>
+        <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 40</span>

 define cd_haproxy::server::proxy (

@@ -314,6 +390,9 @@ $acl_rule         = &#39;&#39;,
 $acl_order        = &#39;020&#39;,
 $backend_name     = undef,
 $backend_order    = &#39;030&#39;,
+$fe_maxconn       = undef,
+$be_server_name   = undef,
+

 ) {