summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-06-11 16:33:03 -0700
committerelijah <elijah@riseup.net>2013-06-11 16:33:03 -0700
commit95d0c71fa4017a7908ccda0adae8057e2115cc42 (patch)
tree11f3f31a27a7c6b8eaf070afc4cad6ebb5a2c577 /puppet/modules
parent907c4fb87f2b1a6c9fdb02ba2bd6017d2019762b (diff)
use hiera hashes for source data for /etc/hosts
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_config/templates/hosts8
1 files changed, 5 insertions, 3 deletions
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts
index 00cc6a79..c2522367 100644
--- a/puppet/modules/site_config/templates/hosts
+++ b/puppet/modules/site_config/templates/hosts
@@ -1,10 +1,12 @@
# 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 hosts.to_s != '' then -%>
-<%= hosts %>
+<%- if @hosts then -%>
+<% @hosts.each do |name, props| -%>
+<%= props["ip_address"] %> <%= props["domain_full"] %>, <%= props["domain_internal"] %>, <%= name %>
+<% end -%>
<% end -%>
# The following lines are desirable for IPv6 capable hosts