diff options
| author | Hunter Haugen <h.haugen@gmail.com> | 2012-10-12 11:28:24 -0700 |
|---|---|---|
| committer | Hunter Haugen <h.haugen@gmail.com> | 2012-10-12 11:32:01 -0700 |
| commit | 3ab65f56a61cfedbe75a3b41143f0d44fbad0a93 (patch) | |
| tree | 1318b8a2daf4ab737d4e01b85328315a2df926ac /templates | |
| parent | f96656440027fbfc73bccf1911c817d7e4392713 (diff) | |
Rename everything!
What is renamed:
- Class/define:
- haproxy::config to haproxy::listen
- haproxy::data to haproxy::params
- Parameters:
- haproxy::listen listen_ip to ipaddress
- haproxy::listen config_options to options
- haproxy haproxy_global_options to global_options
- haproxy haproxy_defaults_options to defaults_options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/haproxy-base.cfg.erb | 6 | ||||
| -rw-r--r-- | templates/haproxy_listen_block.erb (renamed from templates/haproxy_config_block.erb) | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/haproxy-base.cfg.erb b/templates/haproxy-base.cfg.erb index 3e21436..42e791c 100644 --- a/templates/haproxy-base.cfg.erb +++ b/templates/haproxy-base.cfg.erb @@ -1,5 +1,5 @@ global -<% haproxy_global_options.sort.each do |key,val| -%> +<% global_options.sort.each do |key,val| -%> <% if val.is_a?(Array) -%> <% val.each do |item| -%> <%= key %> <%= item %> @@ -10,7 +10,7 @@ global <% end -%> defaults -<% haproxy_defaults_options.sort.each do |key,val| -%> +<% defaults_options.sort.each do |key,val| -%> <% if val.is_a?(Array) -%> <% val.each do |item| -%> <%= key %> <%= item %> @@ -18,4 +18,4 @@ defaults <% else -%> <%= key %> <%= val %> <% end -%> -<% end -%>
\ No newline at end of file +<% end -%> diff --git a/templates/haproxy_config_block.erb b/templates/haproxy_listen_block.erb index 9223140..66abf1f 100644 --- a/templates/haproxy_config_block.erb +++ b/templates/haproxy_listen_block.erb @@ -1,6 +1,6 @@ -listen <%= name %> <%= listen_ip %>:<%= Array(ports).join(",#{listen_ip}:") %> -<% config_options.sort.each do |key, val| -%> +listen <%= name %> <%= ipaddress %>:<%= Array(ports).join(",#{ipaddress}:") %> +<% options.sort.each do |key, val| -%> <% if val.is_a?(Array) -%> <% val.each do |item| -%> <%= key %> <%= item %> |