diff options
| author | elijah <elijah@riseup.net> | 2014-06-04 14:19:55 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-04 14:19:55 -0700 |
| commit | f991e8a4c877cff1d274fd1cac26488f8c3fda84 (patch) | |
| tree | a43a6f15bc9490fc40fb30e43b483d814770796e /puppet/modules/site_config/templates | |
| parent | 79295764ebbefd346407b8042bc759552aa46234 (diff) | |
clean up how /etc/hosts is generated so it doesn't require custom behavior depending on the services.0.5.2
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| -%> |