diff options
| author | Christoph <chris@inferno.nadir.org> | 2014-06-26 15:14:46 +0200 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-06-27 10:53:16 -0400 |
| commit | 4d3a80e3b14c21039eaa58852f0eb4766b5e0e1c (patch) | |
| tree | 0cd30ac33a0e0ea47497152af07a45877f582cc5 /puppet/modules/site_config | |
| parent | c62c9c2e63cfc82fc57f321609e407cfeabd9cdf (diff) | |
reorder /etc/hosts
now "hostname -f" results in the correct hostname.
Fixes #5835
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp index 6982d37b..e43ad45e 100644 --- a/puppet/modules/site_config/manifests/hosts.pp +++ b/puppet/modules/site_config/manifests/hosts.pp @@ -10,10 +10,9 @@ class site_config::hosts() { } else { $dns_aliases = $dns['aliases'] } - $my_hostnames = unique(sort(concat( - [$hostname, $domain_hash['full'], $domain_hash['internal']], - $dns_aliases - ))) + $my_hostnames = unique(concat( + $dns_aliases, [$hostname, $domain_hash['full'], $domain_hash['internal']] + )) file { '/etc/hostname': ensure => present, |