X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Fmanifests%2Finit.pp;h=5e4feaf05a42e04be6dca65ff09fd6d4c175f52b;hb=2f0cdbb3c69400e04c769e9efaa34fa8940267a2;hp=a222910ca7ff2414d635802886520197133b175c;hpb=60085f523c40eb601ce880aab91ef21bfda9c0e3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index a222910ca..5e4feaf05 100644
--- a/modules/geodns/manifests/init.pp
+++ b/modules/geodns/manifests/init.pp
@@ -1,48 +1,97 @@
 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"],
-        owner   => root,
-        group   => root,
-        mode    => 600,
+        file {
+                "/etc/apt/sources.list.d/geoip.list":
+                        source => "puppet:///files/etc/apt/sources.list.d/geoip.list",
+                        notify  => Exec["apt-get update"],
+                        ;
+                "/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,
+                        ;
+                "/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,
+                        ;
+                "/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,
+                        ;
 
-    }
-    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"],
-        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/powerdns/iso2ga/security6":
-        source  => [ "puppet:///geodns/per-host/$fqdn/security6",
-                     "puppet:///geodns/common/security6" ],
-        require => Package["pdns-backend-geo"],
-        notify  => Exec["pdns restart"],
-    }
+                "/etc/bind/geodns":
+                        ensure  => directory,
+                        owner   => root,
+                        group   => geodnssync,
+                        mode    => 775,
+                        ;
+                "/etc/bind/geodns/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,
+                        ;
+                "/etc/bind/geodns/recvconf":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/recvconf",
+                                     "puppet:///geodns/common/recvconf" ],
+                        owner   => root,
+                        group   => root,
+                        mode    => 555,
+                        ;
+                "/etc/bind/geodns/recvconf.files":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/recvconf.files",
+                                     "puppet:///geodns/common/recvconf.files" ],
+                        owner   => root,
+                        group   => root,
+                        mode    => 444,
+                        ;
 
-    exec { "pdns restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
+                "/usr/share/GeoIP/GeoIPv6.dat":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/GeoIPv6.dat",
+                                     "puppet:///geodns/common/GeoIPv6.dat" ],
+                        owner   => root,
+                        group   => root,
+                        mode    => 444,
+                        ;
+
+                "/etc/ssh/userkeys/geodnssync":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/authorized_keys",
+                                     "puppet:///geodns/common/authorized_keys" ],
+                        owner   => root,
+                        group   => geodnssync,
+                        mode    => 440,
+                        ;
+                "/var/log/bind9":
+                        ensure  => directory,
+                        owner   => bind,
+                        group   => bind,
+                        mode    => 775,
+                        ;
+        }
+
+        exec {
+                "bind9 restart":
+                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+                        refreshonly => true,
+                        ;
+        }
 }
 
+# vim: set fdm=marker ts=8 sw=8 et: