confdroid/confdroid_haproxy
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

recommit for updates in build 20

Browse Source
This commit is contained in:
Jenkins ConfDroid
2018-12-30 14:57:34 +01:00
parent 7f047008cd
commit a7f0534963
3 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/091d948219e7b0a">091d948219e7b0a</a> Jenkins ConfDroid <i>2018-12-29 18:55:18</i>
<p>
<h3>recommit for updates in build 19</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/e91d4d6808c3f08">e91d4d6808c3f08</a> Arne Teuke <i>2018-12-29 18:54:41</i>
<p>
<h3>adding backend template for testing</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/2222c8139395f02">2222c8139395f02</a> Jenkins ConfDroid <i>2018-12-29 18:47:43</i> <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/2222c8139395f02">2222c8139395f02</a> Jenkins ConfDroid <i>2018-12-29 18:47:43</i>
<p> <p>
<h3>recommit for updates in build 18</h3> <h3>recommit for updates in build 18</h3>

2
doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html
View File

@@ -140,9 +140,9 @@ class cd_haproxy::server::proxy_test (
cd_haproxy::server::proxy { &#39;testing&#39;: cd_haproxy::server::proxy { &#39;testing&#39;:
frontend_name =&gt; &#39;test01-frontend&#39;, frontend_name =&gt; &#39;test01-frontend&#39;,
acl_rule =&gt; &#39;test01-acl&#39;,
backend_name =&gt; &#39;test01-backend&#39;, backend_name =&gt; &#39;test01-backend&#39;,
} }
}</pre> }</pre>
</td> </td>
</tr> </tr>

50
doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html
View File

@@ -141,6 +141,32 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
<p>the order where the concet should appear in the file.</p> <p>the order where the concet should appear in the file.</p>
</div> </div>
</li>
<li>
<span class='name'>acl_rule</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
</li>
<li>
<span class='name'>acl_order</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;20&#39;</tt>)</em>
</li> </li>
<li> <li>
@@ -164,7 +190,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;020&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;030&#39;</tt>)</em>
</li> </li>
@@ -206,7 +232,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
50 50
51 51
52 52
53</pre> 53
54
55
56
57
58
59
60
61</pre>
</td> </td>
<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 26</span>
@@ -215,14 +249,17 @@ define cd_haproxy::server::proxy (
$frontend_name = undef, $frontend_name = undef,
$frontend_order = &#39;010&#39;, $frontend_order = &#39;010&#39;,
$acl_rule = undef,
$acl_order = &#39;20&#39;,
$backend_name = undef, $backend_name = undef,
$backend_order = &#39;020&#39;, $backend_order = &#39;030&#39;,
) { ) {
$hy_main_config = &#39;/etc/haproxy/haproxy.cfg&#39; $hy_main_config = &#39;/etc/haproxy/haproxy.cfg&#39;
$hy_frontendrule = &#39;cd_haproxy/haproxy_frontend_rule.erb&#39; $hy_frontendrule = &#39;cd_haproxy/haproxy_frontend_rule.erb&#39;
$hy_backendrule = &#39;cd_haproxy/haproxy_backend_rule.erb&#39; $hy_backendrule = &#39;cd_haproxy/haproxy_backend_rule.erb&#39;
$hy_acl_rule = &#39;cd_haproxy/haproxy_acl_rule.erb&#39;
# create frontend section # create frontend section
concat::fragment { &quot;frontend_${name}&quot;: concat::fragment { &quot;frontend_${name}&quot;:
@@ -231,13 +268,18 @@ $hy_backendrule = &#39;cd_haproxy/haproxy_backend_rule.erb&#39;
order =&gt; $frontend_order, order =&gt; $frontend_order,
} }
# create acl section
concat::fragment { &quot;acl_${name}&quot;:
target =&gt; $hy_main_config,
content =&gt; template($hy_acl_rule),
}
# create backend section # create backend section
concat::fragment { &quot;backend_${name}&quot;: concat::fragment { &quot;backend_${name}&quot;:
target =&gt; $hy_main_config, target =&gt; $hy_main_config,
content =&gt; template($hy_backendrule), content =&gt; template($hy_backendrule),
order =&gt; $backend_order, order =&gt; $backend_order,
} }
}</pre> }</pre>
</td> </td>
</tr> </tr>