diff options
| author | varac <varacanero@zeromail.org> | 2014-09-03 23:08:08 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-09-03 23:08:08 +0200 |
| commit | 0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch) | |
| tree | c0db8548571cba8ef8bb5c2a258136c97780acf7 /puppet/modules/site_config | |
| parent | a54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff) | |
| parent | b806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff) | |
Merge branch 'master' into develop
Conflicts:
platform.rb
puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 2 |
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': |