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

recommit for updates in build 12

Browse Source
This commit is contained in:
Jenkins ConfDroid
2018-12-24 16:51:39 +01:00
parent cc55caae5f
commit e947028d18
2 changed files with 274 additions and 43 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/dde6c78663accbf">dde6c78663accbf</a> Jenkins ConfDroid <i>2018-12-19 15:08:40</i>
<p>
<h3>recommit for updates in build 11</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/677ad6914852361">677ad6914852361</a> Arne Teuke <i>2018-12-19 15:07:59</i>
<p>
<h3>adds options</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/8e5168e7bd446e3">8e5168e7bd446e3</a> Jenkins ConfDroid <i>2018-12-18 15:23:43</i> <a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/8e5168e7bd446e3">8e5168e7bd446e3</a> Jenkins ConfDroid <i>2018-12-18 15:23:43</i>
<p> <p>
<h3>recommit for updates in build 10</h3> <h3>recommit for updates in build 10</h3>

307
doc/puppet_classes/cd_haproxy_3A_3Aparams.html
View File

@@ -529,6 +529,207 @@ disables.</p>
</li> </li>
<li>
<span class='name'>hy_use_http_server_close</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Enable or disable HTTP connection closing on the server side</p>
</div>
</li>
<li>
<span class='name'>hy_use_forward_for</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Enable insertion of the X-Forwarded-For header to requests sent to servers.</p>
</div>
</li>
<li>
<span class='name'>hy_use_redispatch</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Enable or disable session redistribution in case of connection failure.</p>
</div>
</li>
<li>
<span class='name'>hy_max_retries</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;3&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Set the number of retries to perform on a server after a connection
failure.</p>
</div>
</li>
<li>
<span class='name'>hy_timeout_http_request</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Set the maximum allowed time to wait for a complete HTTP request.</p>
</div>
</li>
<li>
<span class='name'>hy_timeout_queue</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1m&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Set the maximum time to wait in the queue for a connection slot to be free.</p>
</div>
</li>
<li>
<span class='name'>hy_hy_timeout_connect</span>
<span class='type'>(<tt>string</tt>)</span>
&mdash;
<div class='inline'>
<p>Set the maximum time to wait for a connection attempt to a server to
succeed.</p>
</div>
</li>
<li>
<span class='name'>hy_timeout_client</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1m&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Set the maximum inactivity time on the client side.</p>
</div>
</li>
<li>
<span class='name'>hy_timeout_server</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1m&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Set the maximum inactivity time on the server side.</p>
</div>
</li>
<li>
<span class='name'>hy_timeout_connect</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_timeout_http_keep_alive</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
</li>
<li>
<span class='name'>hy_timeout_check</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -546,24 +747,6 @@ disables.</p>
<pre class="lines"> <pre class="lines">
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74 74
75 75
76 76
@@ -597,44 +780,83 @@ disables.</p>
104 104
105 105
106 106
107</pre> 107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 56</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 74</span>
class cd_haproxy::params ( class cd_haproxy::params (
$pkg_ensure = &#39;latest&#39;, $pkg_ensure = &#39;latest&#39;,
$reqpackages = [&#39;haproxy&#39;], $reqpackages = [&#39;haproxy&#39;],
$hy_host_fqdn = &quot;proxy.${::domain}&quot;, $hy_host_fqdn = &quot;proxy.${::domain}&quot;,
# firewall # firewall
$hy_manage_fw = true, $hy_manage_fw = true,
$hy_fw_order_no = &#39;50&#39;, $hy_fw_order_no = &#39;50&#39;,
# main config # main config
$hy_http_port = &#39;80&#39;, $hy_http_port = &#39;80&#39;,
$hy_https_port = &#39;443&#39;, $hy_https_port = &#39;443&#39;,
$hy_chroot = &#39;/var/lib/haproxy&#39;, $hy_chroot = &#39;/var/lib/haproxy&#39;,
$hy_pid = &#39;/var/run/haproxy.pid&#39;, $hy_pid = &#39;/var/run/haproxy.pid&#39;,
$hy_maxconn = &#39;4000&#39;, $hy_maxconn = &#39;4000&#39;,
$hy_show_stats = true, $hy_show_stats = true,
$hy_stats_socket = &#39;/var/lib/haproxy/stats&#39;, $hy_stats_socket = &#39;/var/lib/haproxy/stats&#39;,
$hy_default_mode = &#39;http&#39;, $hy_default_mode = &#39;http&#39;,
$hy_use_http_server_close = true,
$hy_use_forward_for = true,
$hy_use_redispatch = true,
$hy_max_retries = &#39;3&#39;,
$hy_timeout_http_request = &#39;10s&#39;,
$hy_timeout_queue = &#39;1m&#39;,
$hy_timeout_connect = &#39;10s&#39;,
$hy_timeout_client = &#39;1m&#39;,
$hy_timeout_server = &#39;1m&#39;,
$hy_timeout_http_keep_alive = &#39;10s&#39;,
$hy_timeout_check = &#39;10s&#39;,
# user # user
$hy_user_name = &#39;haproxy&#39;, $hy_user_name = &#39;haproxy&#39;,
$hy_user_comment = &#39;haproxy user&#39;, $hy_user_comment = &#39;haproxy user&#39;,
$hy_user_home = &#39;/var/lib/haproxy&#39;, $hy_user_home = &#39;/var/lib/haproxy&#39;,
$hy_user_shell = &#39;/sbin/nologin&#39;, $hy_user_shell = &#39;/sbin/nologin&#39;,
# logging # logging
$hy_log_target = &#39;127.0.0.1&#39;, $hy_log_target = &#39;127.0.0.1&#39;,
$hy_log_facility = &#39;local2&#39;, $hy_log_facility = &#39;local2&#39;,
$hy_log_default = &#39;global&#39;, $hy_log_default = &#39;global&#39;,
$hy_use_httplog = true, $hy_use_httplog = true,
$hy_use_dontlognull = true, $hy_use_dontlognull = true,
) { ) {
@@ -648,7 +870,6 @@ $hy_main_dir = &#39;/etc/haproxy&#39;
$hy_main_config = &quot;${hy_main_dir}/haproxy.cfg&quot; $hy_main_config = &quot;${hy_main_dir}/haproxy.cfg&quot;
$hy_config_head_erb = &#39;cd_haproxy/haproxy_head.erb&#39; $hy_config_head_erb = &#39;cd_haproxy/haproxy_head.erb&#39;
# includes must be last # includes must be last
include cd_haproxy::main::config include cd_haproxy::main::config