diff options
| author | Zack Smith <acidprime@wallcity.org> | 2012-10-10 17:15:38 -0700 |
|---|---|---|
| committer | Zack Smith <acidprime@wallcity.org> | 2012-10-10 17:15:38 -0700 |
| commit | 2ecc40a69636000adcdf385a3f1991d36d695b9c (patch) | |
| tree | c34a5733cfc517f8dad9cdf406ec765a7dccd6dd | |
| parent | 3d71b9093a8600d465f373de594378b40bd78c83 (diff) | |
| parent | 36fbd37204ade61160ab060b055e9887288dcefd (diff) | |
Merge pull request #11 from hunner/rename_config_options
Rename `haproxy_config_options` parameter to `config_options`
| -rw-r--r-- | manifests/config.pp | 12 | ||||
| -rw-r--r-- | templates/haproxy_config_block.erb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index 415c5f6..974f213 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -38,7 +38,7 @@ # The mode of operation for the listening service. Valid values are 'tcp', # HTTP', and 'health'. # -# [*haproxy_config_options*] +# [*config_options*] # A hash of options that are inserted into the listening service # configuration block. # @@ -69,11 +69,11 @@ # define haproxy::config ( $ports, - $order = '20', - $virtual_ip = $::ipaddress, - $mode = 'tcp', - $collect_exported = true, - $haproxy_config_options = { + $order = '20', + $virtual_ip = $::ipaddress, + $mode = 'tcp', + $collect_exported = true, + $config_options = { 'option' => [ 'tcplog', 'ssl-hello-chk' diff --git a/templates/haproxy_config_block.erb b/templates/haproxy_config_block.erb index 42d0e06..526249f 100644 --- a/templates/haproxy_config_block.erb +++ b/templates/haproxy_config_block.erb @@ -1,6 +1,6 @@ listen <%= name %> <%= virtual_ip %>:<%= Array(ports).join(",#{virtual_ip}:") %> -<% haproxy_config_options.sort.each do |key, val| -%> +<% config_options.sort.each do |key, val| -%> <% if val.is_a?(Array) -%> <% val.each do |item| -%> <%= key %> <%= item %> |