diff --git a/chef/cookbooks/haproxy/attributes/default.rb b/chef/cookbooks/haproxy/attributes/default.rb index 1ee4b59..ee89df3 100644 --- a/chef/cookbooks/haproxy/attributes/default.rb +++ b/chef/cookbooks/haproxy/attributes/default.rb @@ -56,11 +56,11 @@ default['haproxy']['stats_socket_user'] = node['haproxy']['user'] default['haproxy']['stats_socket_group'] = node['haproxy']['group'] default['haproxy']['pid_file'] = "/var/run/haproxy.pid" -default['haproxy']['defaults_options'] = ["tcpka", "httpchk", "tcplog"] +default['haproxy']['defaults_options'] = ["tcpka", "httpchk", "tcplog", "httplog"] default['haproxy']['x_forwarded_for'] = false default['haproxy']['defaults_timeouts']['connect'] = "5s" -default['haproxy']['defaults_timeouts']['client'] = "50s" -default['haproxy']['defaults_timeouts']['server'] = "50s" +default['haproxy']['defaults_timeouts']['client'] = "100s" +default['haproxy']['defaults_timeouts']['server'] = "100s" default['haproxy']['cookie'] = nil default['haproxy']['user'] = "haproxy" diff --git a/chef/cookbooks/haproxy/templates/default/haproxy.cfg.erb b/chef/cookbooks/haproxy/templates/default/haproxy.cfg.erb index c248335..07d75dc 100644 --- a/chef/cookbooks/haproxy/templates/default/haproxy.cfg.erb +++ b/chef/cookbooks/haproxy/templates/default/haproxy.cfg.erb @@ -1,7 +1,7 @@ global - log 127.0.0.1 local0 - log 127.0.0.1 local1 notice - #log loghost local0 info + #log 127.0.0.1 local0 + log 127.0.0.1 local4 notice + log 127.0.0.1 local4 info daemon maxconn <%= node['haproxy']['global_max_connections'] %> #debug diff --git a/cobbler/snippets/hosts b/cobbler/snippets/hosts index 7eb2d2b..13a3e2d 100644 --- a/cobbler/snippets/hosts +++ b/cobbler/snippets/hosts @@ -1,9 +1,9 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -#for $iname, $idata in $interfaces.items() - #set $ip = $idata.get("ip_address", "") - #if $hostname != "" and $ip != "" - $ip $hostname - #end if -#end for -# $compass_ip $compass_hostname +127.0.0.1 $system_name localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 $system_name localhost localhost.localdomain localhost6 localhost6.localdomain6 +# #for $iname, $idata in $interfaces.items() +# #set $ip = $idata.get("ip_address", "") +# #if $hostname != "" and $ip != "" +# $ip $hostname +# #end if +# #end for +# # $compass_ip $compass_hostname diff --git a/cobbler/snippets/post_install_network_config b/cobbler/snippets/post_install_network_config index 012cd1a..6105eff 100644 --- a/cobbler/snippets/post_install_network_config +++ b/cobbler/snippets/post_install_network_config @@ -83,7 +83,7 @@ mv /etc/sysconfig/network.cobbler /etc/sysconfig/network /bin/hostname $hostname #end if -cat << EOL /etc/hosts +cat << EOL > /etc/hosts $SNIPPET('hosts') EOL