diff options
| author | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
| commit | 9198af78956972a01aaf85e19753c5c9e62ea018 (patch) | |
| tree | 7c2c4901c92528b2fababb0e4283d5bec6cd1aef /puppet/modules/site_config/templates | |
| parent | 6100b6ded99241f10e7fb12c13a0820fda084912 (diff) | |
| parent | f991e8a4c877cff1d274fd1cac26488f8c3fda84 (diff) | |
Merge tag '0.5.2'
tagging 0.5.2 release
Diffstat (limited to 'puppet/modules/site_config/templates')
| -rw-r--r-- | puppet/modules/site_config/templates/hosts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts index bfcabaa5..d557f730 100644 --- a/puppet/modules/site_config/templates/hosts +++ b/puppet/modules/site_config/templates/hosts @@ -1,8 +1,7 @@ # This file is managed by puppet, any changes will be overwritten! 127.0.0.1 localhost -127.0.1.1 <%= @hostname %>.<%= @domain_public %> <%= @hostname %> <% if (defined? @services) and (@services.include? 'webapp') -%><%= @domain_public %> <%= @api['domain'] %><% end -%> - +127.0.1.1 <%= @my_hostnames.join(' ') %> <%- if @hosts then -%> <% @hosts.keys.sort.each do |name| -%> |