4 files changed, 51 insertions, 11 deletions
diff --git a/puppet/modules/site_config/manifests/apt.pp b/puppet/modules/site_config/manifests/apt.pp
deleted file mode 100644
index f7ba9ac9..00000000
--- a/puppet/modules/site_config/manifests/apt.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class site_config::apt {
-
-  include ::apt
-  include site_apt::dist_upgrade
-
-  apt::apt_conf { '90disable-pdiffs':
-    content => 'Acquire::PDiffs "false";';
-  }
-
-}
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
new file mode 100644
index 00000000..06cd5c01
--- /dev/null
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -0,0 +1,20 @@
+class site_config::hosts() {
+
+  $hosts = hiera('hosts','')
+  $hostname = hiera('name')
+
+  file { "/etc/hostname":
+    ensure => present,
+    content => $hostname
+  }
+
+  exec { "/bin/hostname $hostname":
+    subscribe   => [ File['/etc/hostname'], File['/etc/hosts'] ],
+    refreshonly => true;
+  }
+
+  file { '/etc/hosts':
+    content => template('site_config/hosts'),
+    mode    => '0644', owner => root, group => root;
+  }
+}
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
index 7f67ad4e..ef4ffbd3 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -4,11 +4,20 @@ class site_config {
   include lsb, git
 
   # configure apt
-  include site_config::apt
+  include site_apt
 
   # configure ssh and include ssh-keys
   include site_config::sshd
 
   # configure /etc/resolv.conf
   include site_config::resolvconf
+
+  # configure /etc/hosts
+  stage { 'initial':
+    before => Stage['main'],
+  }
+
+  class { 'site_config::hosts':
+    stage => initial,
+  }
 }
diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp
index bd0539b9..78f83a62 100644
--- a/puppet/modules/site_config/manifests/resolvconf.pp
+++ b/puppet/modules/site_config/manifests/resolvconf.pp
@@ -1,8 +1,29 @@
 class site_config::resolvconf {
+
+  # bind9
   package { 'bind9':
     ensure => installed,
   }
 
+  service { 'bind9':
+    ensure => running,
+    require => Package['bind9'],
+  }
+
+  file { '/etc/default/bind9':
+    source    => 'puppet:///modules/site_config/bind9',
+    require => Package['bind9'],
+    notify  => Service['bind9'], 
+  }
+
+  file { '/etc/bind/named.conf.options':
+    source => 'puppet:///modules/site_config/named.conf.options',
+    require => Package['bind9'],
+    notify  => Service['bind9'], 
+  }
+
+
+
   $domain_hash = hiera('domain')
   $domain_public = $domain_hash['public']