Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198820
Change subject: Allow the labs dns server to recurse when hit from a labs
instance.
......................................................................
Allow the labs dns server to recurse when hit from a labs instance.
Change-Id: I8abc9e757ab8f44de97edd60d4431d88fdfb87a2
---
M manifests/role/labsdns.pp
M modules/labs_dns/manifests/init.pp
M modules/labs_dns/templates/pdns.conf.erb
3 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/198820/1
diff --git a/manifests/role/labsdns.pp b/manifests/role/labsdns.pp
index 801b5b8..12c1cbf 100644
--- a/manifests/role/labsdns.pp
+++ b/manifests/role/labsdns.pp
@@ -7,5 +7,7 @@
dns_auth_soa_name => 'labs-ns2.wikimedia.org',
pdns_db_host => 'm1-master.eqiad.wmnet',
pdns_db_password => $passwords::pdns::db_pass,
+ pdns_recursor => '208.80.154.239',
+ labs_ip_range => '10.68.0.0/20',
}
}
diff --git a/modules/labs_dns/manifests/init.pp
b/modules/labs_dns/manifests/init.pp
index 261cf61..01fe24d 100644
--- a/modules/labs_dns/manifests/init.pp
+++ b/modules/labs_dns/manifests/init.pp
@@ -10,7 +10,9 @@
$dns_auth_soa_name,
$dns_auth_query_address = '',
$pdns_db_host,
- $pdns_db_password
+ $pdns_db_password,
+ $pdns_recursor,
+ $recursor_ip_range
) {
package { [ 'pdns-server',
diff --git a/modules/labs_dns/templates/pdns.conf.erb
b/modules/labs_dns/templates/pdns.conf.erb
index e5b109f..ab267b8 100644
--- a/modules/labs_dns/templates/pdns.conf.erb
+++ b/modules/labs_dns/templates/pdns.conf.erb
@@ -40,3 +40,5 @@
gmysql-dbname=pdns
gmysql-password=<%= @pdns_db_password %>
+recursor=<%= @pdns_recursor %>
+allow-recursion=<%= @recursor_ip_range %>
--
To view, visit https://gerrit.wikimedia.org/r/198820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8abc9e757ab8f44de97edd60d4431d88fdfb87a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
