Merge branch 'filter-aaaa-on-v4-option' into 6.0-prerelease

manifests/init.pp

@@ -3,6 +3,7 @@
 class bind (
     $forwarders            = '',
     $dnssec                = true,
+    $filter_ipv6           = false,
     $version               = '',
     $rndc                  = undef,
     $statistics_port       = undef,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "inkblot/bind",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "author": "inkblot",
   "license": "Apache-2.0",
   "summary": "ISC BIND name server",

templates/named.conf.erb

@@ -24,6 +24,9 @@ options {
 	auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;
 	listen-on-v6 { any; };
 	dnssec-enable <%= @dnssec ? 'yes' : 'no' %>;
+<%- if @filter_ipv6 -%>
+	filter-aaaa-on-v4 yes;
+<%- end -%>
 <%- if @dnssec -%>
 	dnssec-validation yes;
 	dnssec-lookaside auto;