summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-08-22 21:58:41 +0200
committervarac <varacanero@zeromail.org>2014-08-22 22:10:06 +0200
commit51906e599a400255d528aa2182a1e7e86bb4b230 (patch)
treecb8449609e15965412483423540131fd50da5e9c /puppet/modules/site_config/manifests
parentaa2645c97d0e983e21e271c7cab26f36609e85fe (diff)
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
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp2
1 files changed, 1 insertions, 1 deletions
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':