From 4d3a80e3b14c21039eaa58852f0eb4766b5e0e1c Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 26 Jun 2014 15:14:46 +0200 Subject: reorder /etc/hosts now "hostname -f" results in the correct hostname. Fixes #5835 --- puppet/modules/site_config/manifests/hosts.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'puppet/modules/site_config/manifests') 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, -- cgit v1.2.3 From 51906e599a400255d528aa2182a1e7e86bb4b230 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 22 Aug 2014 21:58:41 +0200 Subject: FQDN should come first in /etc/hosts fixes /etc/hosts: wrong order (Bug #5835) (now for real) before, /etc/hosts contained i.e. 127.0.1.1 plain1 plain1.bitmask.net plain1.bitmask.i which resulted in no fqdn reported both by "hostname -f" and "facter fqdn" this fix produces this order which is needed to report a fqdn: 127.0.1.1 plain1.bitmask.net plain1 plain1.bitmask.i --- puppet/modules/site_config/manifests/hosts.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_config/manifests') diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp index e43ad45e..878b6af0 100644 --- a/puppet/modules/site_config/manifests/hosts.pp +++ b/puppet/modules/site_config/manifests/hosts.pp @@ -11,7 +11,7 @@ class site_config::hosts() { $dns_aliases = $dns['aliases'] } $my_hostnames = unique(concat( - $dns_aliases, [$hostname, $domain_hash['full'], $domain_hash['internal']] + [$domain_hash['full'], $hostname, $domain_hash['internal']], $dns_aliases )) file { '/etc/hostname': -- cgit v1.2.3