diff options
| author | varac <varacanero@zeromail.org> | 2014-02-27 22:43:31 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-27 22:43:31 +0100 |
| commit | c16592b6ac1e56bb9955a337b0564686c9e18e20 (patch) | |
| tree | 0427d06dc8fbe8ef659e63ba65b727f9e74dd80a /puppet/modules/site_config/templates | |
| parent | 0cd0076f945c0e02bfdc50ff483ceebceec131e2 (diff) | |
| parent | 2209afd630a75335e26516c6d9fa1c796bca8a49 (diff) | |
Merge branch 'webapp_check' into 0.6
Diffstat (limited to 'puppet/modules/site_config/templates')
| -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 c0a2740f..bfcabaa5 100644 --- a/puppet/modules/site_config/templates/hosts +++ b/puppet/modules/site_config/templates/hosts @@ -1,7 +1,8 @@ # This file is managed by puppet, any changes will be overwritten! 127.0.0.1 localhost -127.0.1.1 <%= @hostname %>.<%= @domain_public %> <%= @hostname %> +127.0.1.1 <%= @hostname %>.<%= @domain_public %> <%= @hostname %> <% if (defined? @services) and (@services.include? 'webapp') -%><%= @domain_public %> <%= @api['domain'] %><% end -%> + <%- if @hosts then -%> <% @hosts.keys.sort.each do |name| -%> |