From d7f7bad9b6d4a45aa06c74a1f630b38a534092e0 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 20 Jan 2013 15:26:26 +0100
Subject: configure fqdn for host

---
 puppet/modules/site_config/manifests/hosts.pp      | 2 ++
 puppet/modules/site_config/manifests/init.pp       | 2 ++
 puppet/modules/site_config/manifests/resolvconf.pp | 3 +--
 puppet/modules/site_config/templates/hosts         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 06cd5c01..80619e33 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -3,6 +3,8 @@ class site_config::hosts() {
   $hosts = hiera('hosts','')
   $hostname = hiera('name')
 
+  $domain_public = $domain_hash['full_suffix']
+
   file { "/etc/hostname":
     ensure => present,
     content => $hostname
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
index f05bca1c..c27074ed 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -1,4 +1,6 @@
 class site_config {
+  $domain_hash = hiera('domain')
+
   # default class, used by all hosts
 
   include lsb, git
diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp
index a525d8c6..adecb838 100644
--- a/puppet/modules/site_config/manifests/resolvconf.pp
+++ b/puppet/modules/site_config/manifests/resolvconf.pp
@@ -11,8 +11,7 @@ class site_config::resolvconf {
     ensure => absent;
   }
 
-  $domain_hash = hiera('domain')
-  $domain_public = $domain_hash['public']
+  $domain_public = $domain_hash['full_suffix']
 
   # 127.0.0.1:      caching-only local bind
   # 87.118.100.175: http://server.privacyfoundation.de
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts
index 05fb56b9..00cc6a79 100644
--- a/puppet/modules/site_config/templates/hosts
+++ b/puppet/modules/site_config/templates/hosts
@@ -1,7 +1,7 @@
 # This file is managed by puppet, any changes will be overwritten!
 
 127.0.0.1    localhost
-127.0.1.1    <%= hostname %>.<%= domain %> <%= hostname %>
+127.0.1.1    <%= hostname %>.<%= @domain_public %> <%= hostname %>
 
 <%- if hosts.to_s != '' then -%>
 <%= hosts %>
-- 
cgit v1.2.3