summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorChristoph <chris@inferno.nadir.org>2014-06-26 15:14:46 +0200
committerChristoph <chris@inferno.nadir.org>2014-06-26 15:14:46 +0200
commit89669fbc6d43590f73055c00ee0bb415d5c8eb3e (patch)
treee1d65a748d3e3689adf8fd76d1a00915907d365b /puppet
parent31d50d27d9f83552362b3b6ea3ffedd2c520271b (diff)
reorder /etc/hosts
now "hostname -f" results in the correct hostname. Fixes #5835
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp7
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,