diff --git a/manifests/params.pp b/manifests/params.pp index fe3d28e..79f788f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -74,16 +74,16 @@ $hy_pid = '/var/run/haproxy.pid', $hy_maxconn = '4000', $hy_show_stats = true, $hy_stats_socket = '/var/lib/haproxy/stats', -$hy_default_mode = 'http', +$hy_default_mode = 'tcp', $hy_use_http_server_close = false, $hy_use_forward_for = false, -$hy_use_redispatch = false, +$hy_use_redispatch = true, $hy_max_retries = '3', $hy_timeout_http_request = '10s', $hy_timeout_queue = '1m', -$hy_timeout_connect = '10s', -$hy_timeout_client = '1m', -$hy_timeout_server = '1m', +$hy_timeout_connect = '5000', +$hy_timeout_client = '50000', +$hy_timeout_server = '50000', $hy_timeout_http_keep_alive = '10s', $hy_timeout_check = '10s', @@ -94,12 +94,16 @@ $hy_user_home = '/var/lib/haproxy', $hy_user_shell = '/sbin/nologin', # logging +$hy_log_local0 = true, +$hy_log_local1 = true, $hy_log_target = '127.0.0.1', $hy_log_facility = 'local2', $hy_log_default = 'global', +$hy_use_tcplog = true, $hy_use_httplog = false, $hy_use_dontlognull = true, + ) { # service diff --git a/manifests/server/proxy.pp b/manifests/server/proxy.pp index 13aee59..ff5753a 100644 --- a/manifests/server/proxy.pp +++ b/manifests/server/proxy.pp @@ -44,7 +44,6 @@ define cd_haproxy::server::proxy ( $fe_http_request = '', $backend_configs = [], - ) { $hy_main_config = '/etc/haproxy/haproxy.cfg' @@ -79,12 +78,7 @@ define cd_haproxy::server::proxy ( 'order' => $backend_order, }) + # open sepcific firewall ports -# # create backend section -# concat::fragment { "backend_${name}": -# target => $hy_main_config, -# content => template($hy_backendrule), -# order => $backend_order, -# } } diff --git a/templates/haproxy_head.erb b/templates/haproxy_head.erb index 2d7cb6c..b845138 100644 --- a/templates/haproxy_head.erb +++ b/templates/haproxy_head.erb @@ -3,8 +3,12 @@ ############################################################################### global - log <%= @hy_log_target %> <%= @hy_log_facility %> - +<% if @hy_log_local0 == true -%> + log /dev/log local0 +<% end -%> +<% if @hy_log_local1 == true -%> + log /dev/log local1 notice +<% end -%> chroot <%= @hy_chroot %> pidfile <%= @hy_pid %> maxconn <%= @hy_maxconn %> @@ -24,6 +28,9 @@ global defaults mode <%= @hy_default_mode %> log global +<% if @hy_use_tcplog == true -%> + option tcplog +<% end -%> <% if @hy_use_httplog == true -%> option httplog <% end -%>