recommit for updates in build 7

This commit is contained in:
Jenkins ConfDroid
2018-12-10 16:10:37 +01:00
parent f9b79fedb3
commit f0380992ba
3 changed files with 39 additions and 66 deletions

View File

@@ -8,6 +8,21 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/6d7fabe07d541f4">6d7fabe07d541f4</a> Jenkins ConfDroid <i>2018-12-10 14:58:34</i>
<p>
<h3>recommit for updates in build 6</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/7b396df49ec0c21">7b396df49ec0c21</a> Arne Teuke <i>2018-12-10 14:57:50</i>
<p>
<h3>creates the main conffig target and header</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/e64adc8f82410f0">e64adc8f82410f0</a> Arne Teuke <i>2018-12-10 14:56:28</i>
<p>
<h3>creates the main conffig target and header</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/19592e5d1921dd6">19592e5d1921dd6</a> Jenkins ConfDroid <i>2018-12-10 13:39:32</i> <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/19592e5d1921dd6">19592e5d1921dd6</a> Jenkins ConfDroid <i>2018-12-10 13:39:32</i>
<p> <p>
<h3>recommit for updates in build 4</h3> <h3>recommit for updates in build 4</h3>

View File

@@ -158,20 +158,20 @@ class cd_haproxy::main::user (
require cd_haproxy::main::install require cd_haproxy::main::install
# manage user # manage user
user { $hy_user: user { $hy_user_name:
ensure =&gt; present, ensure =&gt; present,
name =&gt; $hy_user, name =&gt; $hy_user_name,
allowdupe =&gt; false, allowdupe =&gt; false,
comment =&gt; $hy_user_comment, comment =&gt; $hy_user_comment,
gid =&gt; $hy_user, gid =&gt; $hy_user_name,
managehome =&gt; true, managehome =&gt; true,
home =&gt; $hy_user_home, home =&gt; $hy_user_home,
shell =&gt; $hy_user_shell, shell =&gt; $hy_user_shell,
} }
group { $hy_user: group { $hy_user_name:
ensure =&gt; present, ensure =&gt; present,
name =&gt; $hy_user, name =&gt; $hy_user_name,
allowdupe =&gt; false, allowdupe =&gt; false,
} }
} }

View File

@@ -219,69 +219,22 @@ fqdns via array.</p>
</li> </li>
<li>
<span class='name'>hy_proxy_mode</span>
<span class='type'>(<tt>string</tt>)</span>
&mdash;
<div class='inline'>
<p>which mode the ha proxy should work in. Valid oprtions are
<code>http</code> and <code>tcp</code>.</p>
</div>
</li>
<li>
<span class='name'>hy_fe_port</span>
<span class='type'>(<tt>string</tt>)</span>
&mdash;
<div class='inline'>
<p>the frontend port to list to. opens in firewall, if enabled, and is used in
configuration templates. only active if <code>hy_proxy_mode</code> is set
to <code>tcp</code>.</p>
</div>
</li>
<li>
<span class='name'>hy_be_port</span>
<span class='type'>(<tt>string</tt>)</span>
&mdash;
<div class='inline'>
<p>the backend port to send traffic through. only active if
<code>hy_proxy_mode</code> is set to <code>tcp</code>.</p>
</div>
</li>
<li> <li>
<span class='name'>hy_http_port</span> <span class='name'>hy_http_port</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> <em class="default">(defaults to: <tt>&#39;80&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the http port. used in firewall settings</p>
</div>
</li> </li>
<li> <li>
@@ -289,12 +242,17 @@ to <code>tcp</code>.</p>
<span class='name'>hy_https_port</span> <span class='name'>hy_https_port</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;443&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;443&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the https port. used in firewall settings</p>
</div>
</li> </li>
<li> <li>
@@ -359,6 +317,11 @@ to <code>tcp</code>.</p>
<pre class="lines"> <pre class="lines">
35
36
37
38
39
40 40
41 41
42 42
@@ -392,15 +355,10 @@ to <code>tcp</code>.</p>
70 70
71 71
72 72
73 73</pre>
74
75
76
77
78</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 35</span>
class cd_haproxy::params ( class cd_haproxy::params (