From f991e8a4c877cff1d274fd1cac26488f8c3fda84 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 4 Jun 2014 14:19:55 -0700
Subject: clean up how /etc/hosts is generated so it doesn't require custom
 behavior depending on the services.

---
 puppet/modules/site_config/manifests/hosts.pp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_config/manifests/hosts.pp')

diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index e5d4dd70..6982d37b 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -1,9 +1,19 @@
 class site_config::hosts() {
   $hosts         = hiera('hosts', false)
+
+  # calculate all the hostname aliases that might be used
   $hostname      = hiera('name')
-  $domain_hash   = hiera('domain')
-  $domain_public = $domain_hash['full_suffix']
-  $api           = hiera('api', '')
+  $domain_hash   = hiera('domain', {})
+  $dns           = hiera('dns', {})
+  if $dns['aliases'] == undef {
+    $dns_aliases = []
+  } else {
+    $dns_aliases = $dns['aliases']
+  }
+  $my_hostnames = unique(sort(concat(
+    [$hostname, $domain_hash['full'], $domain_hash['internal']],
+    $dns_aliases
+  )))
 
   file { '/etc/hostname':
     ensure  => present,
-- 
cgit v1.2.3