recommit for updates in build 8

This commit is contained in:
Jenkins ConfDroid
2018-12-10 16:22:32 +01:00
parent 47d3fefbcb
commit 6bed2aaed9
3 changed files with 48 additions and 23 deletions

View File

@@ -169,7 +169,7 @@ class cd_haproxy::main::files (
# create the header
concat::fragment { 'header':
target => $hy_main_config,
content => $hy_config_head_erb,
content => template($hy_config_head_erb),
order => '001',
}
}

View File

@@ -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