summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/hosts.pp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-06-04 14:19:55 -0700
committerelijah <elijah@riseup.net>2014-06-04 14:19:55 -0700
commitf991e8a4c877cff1d274fd1cac26488f8c3fda84 (patch)
treea43a6f15bc9490fc40fb30e43b483d814770796e /puppet/modules/site_config/manifests/hosts.pp
parent79295764ebbefd346407b8042bc759552aa46234 (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/manifests/hosts.pp')
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp16
1 files changed, 13 insertions, 3 deletions
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,