We push this with a Makefile for now

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
deleted file mode 100644 (file)
index 8c21bb6..0000000
--- a/modules/geodns/files/common/named.conf.geo
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-//
-
-view "Africa" {
-       match-clients {
-               Africa;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AF";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AF";
-               notify no;
-        };
-};
-
-view "Asia" {
-       match-clients {
-               Asia;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AS";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AS";
-               notify no;
-        };
-};
-
-view "Europe" {
-       match-clients { 
-               Europe; 
-       };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.EU";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.EU";
-               notify no;
-        };
-};
-
-view "NorthAmerica" {
-       match-clients {
-               NorthAmerica;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.NA";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.NA";
-               notify no;
-        };
-};
-view "SouthAmerica" {
-       match-clients {
-               SouthAmerica;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.SA";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.SA";
-               notify no;
-        };
-};
-view "Oceania" {
-       match-clients {
-               Oceania;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.OC";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.OC";
-               notify no;
-        };
-};
-view "Antarctica" {
-       match-clients {
-               Antarctica;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AN";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AN";
-               notify no;
-        };
-};
-view "other" {
-        match-clients { any; };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org";
-               notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org";
-               notify no;
-        };
-};

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index a0397d0..27d2365 100644 (file)
--- a/modules/geodns/manifests/init.pp
+++ b/modules/geodns/manifests/init.pp
@@ -17,14 +17,6 @@ class geodns {
                         owner   => root,
                         group   => root,
                         ;
-                "/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,
-                        ;
                 "/etc/bind/named.conf.acl":
                         source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.acl",
                                      "puppet:///geodns/common/named.conf.acl" ],