summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp2
-rw-r--r--puppet/modules/site_config/manifests/init.pp2
-rw-r--r--puppet/modules/site_config/manifests/resolvconf.pp3
3 files changed, 5 insertions, 2 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