From: Stephen Gran <steve@lobefin.net>
Date: Tue, 1 May 2012 10:40:21 +0000 (+0100)
Subject: unused module
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aaa4e58c67c09376d770b64137d2a34cd25c847b;p=dsa-puppet.git

unused module

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

diff --git a/modules/named/manifests/recursor.pp b/modules/named/manifests/recursor.pp
deleted file mode 100644
index 3bd06d9b..00000000
--- a/modules/named/manifests/recursor.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class named::recursor inherits named {
-
-	file { '/etc/bind/named.conf.options':
-		content => template('named/named.conf.options.erb'),
-		notify  => Service['bind9'],
-	}
-}
diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 4224254d..630058bb 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -20,12 +20,8 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-<% if classes.include?("named::recursor") -%>
-	listen-on-v6 { any; };
-<% else -%>
 	listen-on { ! 127.0.0.1; any; };
 	listen-on-v6 { ! ::1; any; };
-<% end -%>
 
 	allow-transfer { none; };
 	allow-update { none; };
@@ -35,9 +31,6 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::recursor')
-    allowed += 'localnets; '
-  end
 
   str =  "\tallow-recursion { " + allowed + " };\n"
   str += "\tallow-query { " + allowed + " };\n"