diff options
| author | elijah <elijah@riseup.net> | 2016-04-08 10:41:54 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-04-08 10:41:54 -0700 |
| commit | 82b15a8a071ba099cf52bb00c66caebdbd265273 (patch) | |
| tree | 3f27b0673839be7d10ed5b401216ab79e43ce751 /puppet/modules/site_config | |
| parent | 44666c42ce836fb611dfd9c1b549e955c470814c (diff) | |
| parent | eac3056c237d523f4786593922fe8f88eb65dff7 (diff) | |
Merge branch 'feature/mxtest' into develop
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/templates/hosts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts index d557f730..d62cbc3f 100644 --- a/puppet/modules/site_config/templates/hosts +++ b/puppet/modules/site_config/templates/hosts @@ -6,7 +6,8 @@ <%- if @hosts then -%> <% @hosts.keys.sort.each do |name| -%> <%- props = @hosts[name] -%> -<%= props["ip_address"] %> <%= props["domain_full"] %> <%= props["domain_internal"] %> <%= name %> +<%- aliases = props["aliases"] ? props["aliases"].join(' ') : nil -%> +<%= [props["ip_address"], props["domain_full"], props["domain_internal"], aliases, name].compact.uniq.join(' ') %> <% end -%> <% end -%> |