recommit for updates in build 214

This commit is contained in:
Jenkins ConfDroid
2025-02-12 11:54:09 +01:00
parent ce221d6dc1
commit 3856974c2f
2 changed files with 60 additions and 25 deletions

View File

@@ -442,7 +442,7 @@ rsyslog forwarding supported.</p>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;http&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;tcp&#39;</tt>)</em>
&mdash; &mdash;
@@ -553,7 +553,7 @@ disables.</p>
<span class='type'>(<tt>boolean</tt>)</span> <span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em> <em class="default">(defaults to: <tt>true</tt>)</em>
&mdash; &mdash;
@@ -626,7 +626,7 @@ failure.</p>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;5000&#39;</tt>)</em>
&mdash; &mdash;
@@ -645,7 +645,7 @@ succeed.</p>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1m&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;50000&#39;</tt>)</em>
&mdash; &mdash;
@@ -663,7 +663,7 @@ succeed.</p>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1m&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;50000&#39;</tt>)</em>
&mdash; &mdash;
@@ -709,6 +709,45 @@ succeed.</p>
</li> </li>
<li>
<span class='name'>hy_log_local0</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
</li>
<li>
<span class='name'>hy_log_local1</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
</li>
<li>
<span class='name'>hy_use_tcplog</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
</li>
</ul> </ul>
@@ -797,7 +836,11 @@ succeed.</p>
132 132
133 133
134 134
135</pre> 135
136
137
138
139</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span>
@@ -821,16 +864,16 @@ $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;tcp&#39;,
$hy_use_http_server_close = false, $hy_use_http_server_close = false,
$hy_use_forward_for = false, $hy_use_forward_for = false,
$hy_use_redispatch = false, $hy_use_redispatch = true,
$hy_max_retries = &#39;3&#39;, $hy_max_retries = &#39;3&#39;,
$hy_timeout_http_request = &#39;10s&#39;, $hy_timeout_http_request = &#39;10s&#39;,
$hy_timeout_queue = &#39;1m&#39;, $hy_timeout_queue = &#39;1m&#39;,
$hy_timeout_connect = &#39;10s&#39;, $hy_timeout_connect = &#39;5000&#39;,
$hy_timeout_client = &#39;1m&#39;, $hy_timeout_client = &#39;50000&#39;,
$hy_timeout_server = &#39;1m&#39;, $hy_timeout_server = &#39;50000&#39;,
$hy_timeout_http_keep_alive = &#39;10s&#39;, $hy_timeout_http_keep_alive = &#39;10s&#39;,
$hy_timeout_check = &#39;10s&#39;, $hy_timeout_check = &#39;10s&#39;,
@@ -841,12 +884,16 @@ $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_local0 = true,
$hy_log_local1 = true,
$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_tcplog = true,
$hy_use_httplog = false, $hy_use_httplog = false,
$hy_use_dontlognull = true, $hy_use_dontlognull = true,
) { ) {
# service # service

View File

@@ -502,13 +502,7 @@ instance configuration.</p>
81 81
82 82
83 83
84 84</pre>
85
86
87
88
89
90</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 24</span> <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 24</span>
@@ -536,7 +530,6 @@ define cd_haproxy::server::proxy (
$fe_http_request = &#39;&#39;, $fe_http_request = &#39;&#39;,
$backend_configs = [], $backend_configs = [],
) { ) {
$hy_main_config = &#39;/etc/haproxy/haproxy.cfg&#39; $hy_main_config = &#39;/etc/haproxy/haproxy.cfg&#39;
@@ -571,13 +564,8 @@ define cd_haproxy::server::proxy (
&#39;order&#39; =&gt; $backend_order, &#39;order&#39; =&gt; $backend_order,
}) })
# open sepcific firewall ports
# # create backend section
# concat::fragment { &quot;backend_${name}&quot;:
# target =&gt; $hy_main_config,
# content =&gt; template($hy_backendrule),
# order =&gt; $backend_order,
# }
}</pre> }</pre>
</td> </td>