1 files changed, 15 insertions, 46 deletions
diff --git a/modules/bind/manifests/init.pp b/modules/bind/manifests/init.pp
index 60ef7a04..a5d20c09 100644
--- a/modules/bind/manifests/init.pp
+++ b/modules/bind/manifests/init.pp
@@ -1,56 +1,25 @@
 class bind {
-    class bind_base {
-        package { bind:
-            ensure => installed
-        }
+    package { 'bind': }
 
-        service { named:
-            ensure => running,
-            path => "/etc/init.d/named",
-            subscribe => [ Package["bind"]]
-        }
-
-        file { '/etc/named.conf':
-            ensure => "/var/lib/named/etc/named.conf",
-            owner => root,
-            group => root,
-            mode => 644
-        } 
+    service { 'named':
+        restart   => 'service named restart',
+        subscribe => Package['bind'],
     }
 
-
-    file { '/var/lib/named/etc/named.conf':
-        ensure => present,
-        owner => root,
-        group => root,
-        mode => 644,
-        require => Package["bind"],
-        content => "",
-        notify => [Service['named']]
+    file { '/etc/named.conf':
+        ensure  => link,
+        target  => '/var/lib/named/etc/named.conf',
+        require => Package['bind'],
     }
 
-    define zone_master {
-        file { "/var/lib/named/var/named/master/$name.zone":
-            ensure => present,
-            owner => root,
-            group => root,
-            mode => 644,
-            content => template("bind/zones/$name.zone"),
-            require => Package[bind],
-            notify => Service[named]
-        }
+    exec { 'named_reload':
+        command     => 'service named reload',
+        refreshonly => true,
     }
 
-    class bind_master inherits bind_base {
-        file { '/var/lib/named/etc/named.conf':
-            content => template("bind/named_base.conf", "bind/named_master.conf"),
-        }
-    }
-
-    class bind_slave inherits bind_base {
-        file { '/var/lib/named/etc/named.conf':
-            content => template("bind/named_base.conf", "bind/named_slave.conf"),
-        }
+    file { '/var/lib/named/etc/named.conf':
+        require => Package['bind'],
+        content => '',
+        notify  => Service['named'],
     }
-
 }