COOK-805, more consistent attribute names for haproxy configuration

Author: jtimberman

README.md

@@ -34,14 +34,14 @@ Tested on Ubuntu 8.10 and higher.
 Attributes
 ==========
 
+* `node['haproxy']['incoming_port']` - sets the port on which haproxy listens
 * `node['haproxy']['member_port']` - the port that member systems will be listening on, default 80
 * `node['haproxy']['enable_admin']` - whether to enable the admin interface. default true. Listens on port 22002.
 * `node['haproxy']['app_server_role']` - used by the `app_lb` recipe to search for a specific role of member systems. Default `webserver`.
 * `node['haproxy']['balance_algorithm']` - sets the load balancing algorithm; defaults to roundrobin.
-* `node['haproxy']['incoming_port']` - sets the port on which haproxy listens
-* `node['haproxy']['max_connections_per_server']` - the maxconn value to be set for each app server
-* `node['haproxy']['add_x_forwarded_for']` - if true, creates an X-Forwarded-For header containing the original client's IP address. This option disables KeepAlive.
-* `node['haproxy']['ssl_enabled']` - whether or not to create listeners for ssl, default false
+* `node['haproxy']['member_max_connections']` - the maxconn value to be set for each app server
+* `node['haproxy']['x_forwarded_for']` - if true, creates an X-Forwarded-For header containing the original client's IP address. This option disables KeepAlive.
+* `node['haproxy']['enable_ssl']` - whether or not to create listeners for ssl, default false
 * `node['haproxy']['ssl_member_port']` - the port that member systems will be listening on for ssl, default 8443
 * `node['haproxy']['ssl_incoming_port']` - sets the port on which haproxy listens for ssl, default 443
 

attributes/default.rb

@@ -17,13 +17,13 @@
 # limitations under the License.
 #
 
+default['haproxy']['incoming_port'] = "80"
 default['haproxy']['member_port'] = "8080"
 default['haproxy']['enable_admin'] = true
 default['haproxy']['app_server_role'] = "webserver"
 default['haproxy']['balance_algorithm'] = "roundrobin"
-default['haproxy']['incoming_port'] = "80"
-default['haproxy']['max_connections_per_server'] = "100"
-default['haproxy']['add_x_forwarded_for'] = false
-default['haproxy']['ssl_enabled'] = false
+default['haproxy']['member_max_connections'] = "100"
+default['haproxy']['x_forwarded_for'] = false
+default['haproxy']['enable_ssl'] = false
 default['haproxy']['ssl_incoming_port'] = "443"
 default['haproxy']['ssl_member_port'] = "8443"

templates/default/haproxy-app_lb.cfg.erb

@@ -19,7 +19,7 @@ defaults
         contimeout      5000
         clitimeout      50000
         srvtimeout      50000
-        <% if node["haproxy"]["apply_x_forwarded_for"] -%>
+        <% if node["haproxy"]["x_forwarded_for"] -%>
         option httpclose
         option forwardfor
         <% end -%>
@@ -28,15 +28,15 @@ defaults
 listen application 0.0.0.0:<%= node["haproxy"]["incoming_port"] %>
   balance <%= node["haproxy"]["balance_algorithm"] %>
   <% @pool_members.each do |member| -%>
-  server <%= member[:hostname] %> <%= member[:ipaddress] %>:<%= node["haproxy"]["member_port"] %> weight 1 maxconn <%= node["haproxy"]["max_connections_per_server"] %> check
+  server <%= member[:hostname] %> <%= member[:ipaddress] %>:<%= node["haproxy"]["member_port"] %> weight 1 maxconn <%= node["haproxy"]["member_max_connections"] %> check
   <% end -%>
 
-<% if node["haproxy"]["ssl_enabled"] -%>
+<% if node["haproxy"]["enable_ssl"] -%>
 listen ssl_application 0.0.0.0:<%= node["haproxy"]["ssl_incoming_port"] %>
   balance <%= node["haproxy"]["balance_algorithm"] %>
   mode tcp
   <% @pool_members.each do |member| -%>
-  server <%= member[:hostname] %> <%= member[:ipaddress] %>:<%= node["haproxy"]["ssl_member_port"] %> weight 1 maxconn <%= node["haproxy"]["max_connections_per_server"] %> check
+  server <%= member[:hostname] %> <%= member[:ipaddress] %>:<%= node["haproxy"]["ssl_member_port"] %> weight 1 maxconn <%= node["haproxy"]["member_max_connections"] %> check
   <% end -%>
 <% end -%>
 

templates/default/haproxy.cfg.erb

@@ -21,7 +21,13 @@ defaults
         srvtimeout      50000
 
 # Set up application listeners here.
-listen application 0.0.0.0:8400
-  balance roundrobin
-  server localhost 127.0.0.1:4000 weight 1 maxconn 5 check 
-  server localhost 127.0.0.1:4001 weight 1 maxconn 5 check 
+listen application 0.0.0.0:<%= node["haproxy"]["incoming_port"] %>
+  balance  <%= node["haproxy"]["balance_algorithm"] %>
+  server localhost 127.0.0.1:4000 weight 1 maxconn <%= node["haproxy"]["member_max_connections"] %> check 
+  server localhost 127.0.0.1:4001 weight 1 maxconn <%= node["haproxy"]["member_max_connections"] %> check 
+
+<% if node["haproxy"]["enable_admin"] -%>
+listen admin 0.0.0.0:22002
+  mode http
+  stats uri /
+<% end -%>