recommit for updates in build 19
This commit is contained in:
10
CHANGELOG.md
10
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/2222c8139395f02">2222c8139395f02</a> Jenkins ConfDroid <i>2018-12-29 18:47:43</i>
|
||||
<p>
|
||||
<h3>recommit for updates in build 18</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/66f16e8e09c4d13">66f16e8e09c4d13</a> Arne Teuke <i>2018-12-29 18:47:00</i>
|
||||
<p>
|
||||
<h3>adding template for testing</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/3b005f04a4e82e6">3b005f04a4e82e6</a> Jenkins ConfDroid <i>2018-12-29 18:44:26</i>
|
||||
<p>
|
||||
<h3>recommit for updates in build 17</h3>
|
||||
|
||||
@@ -128,7 +128,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
28
|
||||
29
|
||||
30
|
||||
31</pre>
|
||||
31
|
||||
32</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/server/proxy_test.pp', line 23</span>
|
||||
@@ -138,7 +139,8 @@ class cd_haproxy::server::proxy_test (
|
||||
) inherits cd_haproxy::params {
|
||||
|
||||
cd_haproxy::server::proxy { 'testing':
|
||||
frontend_name => 'test01',
|
||||
frontend_name => 'test01-frontend',
|
||||
backend_name => 'test01-backend',
|
||||
}
|
||||
|
||||
}</pre>
|
||||
|
||||
@@ -143,6 +143,32 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>backend_name</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Any</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>undef</tt>)</em>
|
||||
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>backend_order</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Any</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'020'</tt>)</em>
|
||||
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -170,7 +196,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
40
|
||||
41
|
||||
42
|
||||
43</pre>
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50
|
||||
51
|
||||
52
|
||||
53</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 26</span>
|
||||
@@ -179,11 +215,14 @@ define cd_haproxy::server::proxy (
|
||||
|
||||
$frontend_name = undef,
|
||||
$frontend_order = '010',
|
||||
$backend_name = undef,
|
||||
$backend_order = '020',
|
||||
|
||||
) {
|
||||
|
||||
$hy_main_config = '/etc/haproxy/haproxy.cfg'
|
||||
$hy_frontendrule = 'cd_haproxy/haproxy_frontend_rule.erb'
|
||||
$hy_backendrule = 'cd_haproxy/haproxy_backend_rule.erb'
|
||||
|
||||
# create frontend section
|
||||
concat::fragment { "frontend_${name}":
|
||||
@@ -192,6 +231,13 @@ $hy_frontendrule = 'cd_haproxy/haproxy_frontend_rule.erb'
|
||||
order => $frontend_order,
|
||||
}
|
||||
|
||||
# create backend section
|
||||
concat::fragment { "backend_${name}":
|
||||
target => $hy_main_config,
|
||||
content => template($hy_backendrule),
|
||||
order => $backend_order,
|
||||
}
|
||||
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user