X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Fmanifests%2Finit.pp;h=b70dfcd89faf4ac9204c3b54df85c102488d945a;hb=e3b2ac9b288d8001ace626d659aa862906d22da7;hp=a222910ca7ff2414d635802886520197133b175c;hpb=9b5b5a7fa2fa936ed091de108a1679a48d44578e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index a222910ca..b70dfcd89 100644
--- a/modules/geodns/manifests/init.pp
+++ b/modules/geodns/manifests/init.pp
@@ -1,46 +1,51 @@
 class geodns {
 
-    package { pdns-backend-geo: ensure => installed }
+    package { bind9: ensure => installed }
 
-    file { "/etc/powerdns/pdns.conf":
-        source  => [ "puppet:///geodns/per-host/$fqdn/pdns.conf",
-                     "puppet:///geodns/common/pdns.conf" ],
-        require => Package["pdns-backend-geo"],
-        notify  => Exec["pdns restart"],
+    file {
+      "/etc/apt/sources.list.d/geoip.list":
+             source => "puppet:///files/etc/apt/sources.list.d/geoip.list",
+             notify  => Exec["apt-get update"],
+             ;
+    }
+    file { "/etc/bind/named.conf.local":
+        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.local",
+                     "puppet:///geodns/common/named.conf.local" ],
+        require => Package["bind9"],
+        notify  => Exec["bind9 restart"],
         owner   => root,
         group   => root,
-        mode    => 600,
 
     }
-    file { "/etc/powerdns/pdns.d/pdns.local":
-        source  => [ "puppet:///geodns/per-host/$fqdn/pdns.local",
-                     "puppet:///geodns/common/pdns.local" ],
-        require => Package["pdns-backend-geo"],
-        notify  => Exec["pdns restart"],
+    file { "/etc/bind/named.conf.geo":
+        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.geo",
+                     "puppet:///geodns/common/named.conf.geo" ],
+        require => Package["bind9"],
+        notify  => Exec["bind9 restart"],
         owner   => root,
         group   => root,
-        mode    => 600,
-    }
-    file { "/etc/powerdns/ip2iso":
-        source  => [ "puppet:///geodns/per-host/$fqdn/ip2iso",
-                     "puppet:///geodns/common/ip2iso" ],
-        require => Package["pdns-backend-geo"],
-        notify  => Exec["pdns restart"],
+
     }
-    file { "/etc/powerdns/iso2ga/security":
-        source  => [ "puppet:///geodns/per-host/$fqdn/security",
-                     "puppet:///geodns/common/security" ],
-        require => Package["pdns-backend-geo"],
-        notify  => Exec["pdns restart"],
+    file { "/etc/bind/named.conf.acl":
+        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.acl",
+                     "puppet:///geodns/common/named.conf.acl" ],
+        require => Package["bind9"],
+        notify  => Exec["bind9 restart"],
+        owner   => root,
+        group   => root,
+
     }
-    file { "/etc/powerdns/iso2ga/security6":
-        source  => [ "puppet:///geodns/per-host/$fqdn/security6",
-                     "puppet:///geodns/common/security6" ],
-        require => Package["pdns-backend-geo"],
-        notify  => Exec["pdns restart"],
+    file { "/etc/bind/named.conf.options":
+        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.options",
+                     "puppet:///geodns/common/named.conf.options" ],
+        require => Package["bind9"],
+        notify  => Exec["bind9 restart"],
+        owner   => root,
+        group   => root,
+
     }
 
-    exec { "pdns restart":
+    exec { "bind9 restart":
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }