Merge branch 'master' of /git/ansible
This commit is contained in:
Kevin Fenzi
commit
542f145f21
3 changed files with 96 additions and 113 deletions
|
|
@ -49,12 +49,11 @@ options {
|
|||
};
|
||||
notify yes;
|
||||
minimal-responses yes;
|
||||
// internal nameservers shouldn't ratelimit
|
||||
// rate-limit requests
|
||||
//rate-limit {
|
||||
// responses-per-second 25;
|
||||
// window 5;
|
||||
//};
|
||||
rate-limit {
|
||||
responses-per-second 25;
|
||||
window 5;
|
||||
};
|
||||
};
|
||||
//
|
||||
logging {
|
||||
|
|
@ -139,73 +138,73 @@ view "PHX2" {
|
|||
|
||||
zone "qa.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/qa.fedoraproject.org";
|
||||
file "master/built/qa.fedoraproject.org";
|
||||
};
|
||||
|
||||
zone "phx2.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/phx2.fedoraproject.org";
|
||||
file "master/built/phx2.fedoraproject.org";
|
||||
};
|
||||
|
||||
zone "mgmt.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/mgmt.fedoraproject.org";
|
||||
file "master/built/mgmt.fedoraproject.org";
|
||||
};
|
||||
|
||||
zone "arm.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/arm.fedoraproject.org";
|
||||
file "master/built/arm.fedoraproject.org";
|
||||
};
|
||||
|
||||
zone "78.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/78.5.10.in-addr.arpa";
|
||||
file "master/built/78.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "79.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/79.5.10.in-addr.arpa";
|
||||
file "master/built/79.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "124.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/124.5.10.in-addr.arpa";
|
||||
file "master/built/124.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "125.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/125.5.10.in-addr.arpa";
|
||||
file "master/built/125.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "126.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/126.5.10.in-addr.arpa";
|
||||
file "master/built/126.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "127.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/127.5.10.in-addr.arpa";
|
||||
file "master/built/127.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "128.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/128.5.10.in-addr.arpa";
|
||||
file "master/built/128.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "130.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/130.5.10.in-addr.arpa";
|
||||
file "master/built/130.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "131.5.10.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/131.5.10.in-addr.arpa";
|
||||
file "master/built/131.5.10.in-addr.arpa";
|
||||
};
|
||||
|
||||
|
||||
zone "fedoraproject.org" {
|
||||
type master;
|
||||
file "master/DEFAULT/fedoraproject.org.signed";
|
||||
file "master/built/DEFAULT/fedoraproject.org.signed";
|
||||
};
|
||||
|
||||
include "etc/zones.conf";
|
||||
|
|
@ -218,11 +217,11 @@ view "NA" {
|
|||
recursion no;
|
||||
zone "fedoraproject.org" {
|
||||
type master;
|
||||
file "master/NA/fedoraproject.org.signed";
|
||||
file "master/built/NA/fedoraproject.org.signed";
|
||||
};
|
||||
zone "cloud.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/NA/cloud.fedoraproject.org.signed";
|
||||
file "master/built/NA/cloud.fedoraproject.org.signed";
|
||||
};
|
||||
include "etc/zones.conf";
|
||||
};
|
||||
|
|
@ -232,11 +231,11 @@ view "GB" {
|
|||
recursion no;
|
||||
zone "fedoraproject.org" {
|
||||
type master;
|
||||
file "master/GB/fedoraproject.org.signed";
|
||||
file "master/built/GB/fedoraproject.org.signed";
|
||||
};
|
||||
zone "cloud.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/GB/cloud.fedoraproject.org.signed";
|
||||
file "master/built/GB/cloud.fedoraproject.org.signed";
|
||||
};
|
||||
include "etc/zones.conf";
|
||||
};
|
||||
|
|
@ -248,11 +247,11 @@ view "EU" {
|
|||
recursion no;
|
||||
zone "fedoraproject.org" {
|
||||
type master;
|
||||
file "master/EU/fedoraproject.org.signed";
|
||||
file "master/built/EU/fedoraproject.org.signed";
|
||||
};
|
||||
zone "cloud.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/EU/cloud.fedoraproject.org.signed";
|
||||
file "master/built/EU/cloud.fedoraproject.org.signed";
|
||||
};
|
||||
include "etc/zones.conf";
|
||||
};
|
||||
|
|
@ -263,11 +262,11 @@ view "DEFAULT" {
|
|||
recursion no;
|
||||
zone "fedoraproject.org" {
|
||||
type master;
|
||||
file "master/DEFAULT/fedoraproject.org.signed";
|
||||
file "master/built/DEFAULT/fedoraproject.org.signed";
|
||||
};
|
||||
zone "cloud.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/DEFAULT/cloud.fedoraproject.org.signed";
|
||||
file "master/built/DEFAULT/cloud.fedoraproject.org.signed";
|
||||
};
|
||||
include "etc/zones.conf";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,34 +1,18 @@
|
|||
#!/bin/bash
|
||||
tmpdir=`mktemp -d`
|
||||
dnsgit='https://infrastructure.fedoraproject.org/infra/dns.git'
|
||||
destdir='/var/named/chroot/master/'
|
||||
|
||||
if [ -d $destdir ];
|
||||
then
|
||||
cd $destdir
|
||||
git pull -X theirs
|
||||
else
|
||||
git clone $dnsgit $destdir
|
||||
fi
|
||||
cd $tmpdir
|
||||
|
||||
# clone the dnsgit repo
|
||||
git clone $dnsgit >> /dev/null
|
||||
if [ $? != 0 ]; then
|
||||
echo "Error cloning dns git repo"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd dns
|
||||
# diff the two dirs - if they are the same - do nothing
|
||||
diff -qurN built/ $destdir >>/dev/null
|
||||
if [ $? != 0 ]; then
|
||||
# rsync our new files overtop of the destdir files
|
||||
rsync -a -q --delete-after built/ $destdir
|
||||
if [ $? != 0 ]; then
|
||||
echo "Error rsyncing files overtop from git repo:: $tmpdir/dns/built"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# change context so the chroot can cope
|
||||
chown -R named.named $destdir
|
||||
chcon -u system_u $destdir/* $destdir/*/*
|
||||
# reload named
|
||||
/sbin/service named reload
|
||||
fi
|
||||
|
||||
|
||||
rm -rf $tmpdir
|
||||
# change context so the chroot can cope
|
||||
chown -R named.named $destdir
|
||||
chcon -u system_u $destdir/* $destdir/*/*
|
||||
# reload named
|
||||
/sbin/service named reload
|
||||
|
|
|
|||
|
|
@ -4,131 +4,131 @@ zone "." {
|
|||
};
|
||||
zone "fedora.us" {
|
||||
type master;
|
||||
file "master/fedora.us.signed";
|
||||
file "master/built/fedora.us.signed";
|
||||
};
|
||||
zone "fedora.my" {
|
||||
type master;
|
||||
file "master/fedora.my";
|
||||
file "master/built/fedora.my";
|
||||
};
|
||||
zone "fedora.com.my" {
|
||||
type master;
|
||||
file "master/fedora.com.my";
|
||||
file "master/built/fedora.com.my";
|
||||
};
|
||||
zone "fedora.pt" {
|
||||
type master;
|
||||
file "master/fedora.pt";
|
||||
file "master/built/fedora.pt";
|
||||
};
|
||||
zone "fedoralinux.com" {
|
||||
type master;
|
||||
file "master/fedoralinux.com.signed";
|
||||
file "master/built/fedoralinux.com.signed";
|
||||
};
|
||||
zone "fedoralinux.net" {
|
||||
type master;
|
||||
file "master/fedoralinux.net.signed";
|
||||
file "master/built/fedoralinux.net.signed";
|
||||
};
|
||||
zone "fedoralinux.org" {
|
||||
type master;
|
||||
file "master/fedoralinux.org.signed";
|
||||
file "master/built/fedoralinux.org.signed";
|
||||
};
|
||||
zone "fedoramagazine.org" {
|
||||
type master;
|
||||
file "master/fedoramagazine.org.signed";
|
||||
file "master/built/fedoramagazine.org.signed";
|
||||
};
|
||||
zone "fedoraproject.com" {
|
||||
type master;
|
||||
file "master/fedoraproject.com.signed";
|
||||
file "master/built/fedoraproject.com.signed";
|
||||
};
|
||||
zone "fedoraproject.com.my" {
|
||||
type master;
|
||||
file "master/fedoraproject.com.my";
|
||||
file "master/built/fedoraproject.com.my";
|
||||
};
|
||||
zone "fedoraproject.su" {
|
||||
type master;
|
||||
file "master/fedoraproject.su";
|
||||
file "master/built/fedoraproject.su";
|
||||
};
|
||||
|
||||
zone "fedoraproject.net" {
|
||||
type master;
|
||||
file "master/fedoraproject.net.signed";
|
||||
file "master/built/fedoraproject.net.signed";
|
||||
};
|
||||
zone "fedoraproject.co.uk" {
|
||||
type master;
|
||||
file "master/fedoraproject.co.uk";
|
||||
file "master/built/fedoraproject.co.uk";
|
||||
};
|
||||
zone "fedorahosted.org" {
|
||||
type master;
|
||||
file "master/fedorahosted.org.signed";
|
||||
file "master/built/fedorahosted.org.signed";
|
||||
};
|
||||
//zone "fedoraproject.org" {
|
||||
// type master;
|
||||
// file "master/fedoraproject.org.signed";
|
||||
// file "master/built/fedoraproject.org.signed";
|
||||
//};
|
||||
|
||||
zone "vpn.fedoraproject.org" {
|
||||
type master;
|
||||
file "master/vpn.fedoraproject.org.signed";
|
||||
file "master/built/vpn.fedoraproject.org.signed";
|
||||
};
|
||||
|
||||
zone "fedorapeople.org" {
|
||||
type master;
|
||||
file "master/fedorapeople.org.signed";
|
||||
file "master/built/fedorapeople.org.signed";
|
||||
};
|
||||
zone "fedoraproject.org.uk" {
|
||||
type master;
|
||||
file "master/fedoraproject.org.uk.signed";
|
||||
file "master/built/fedoraproject.org.uk.signed";
|
||||
};
|
||||
zone "smolts.org" {
|
||||
type master;
|
||||
file "master/smolts.org.signed";
|
||||
file "master/built/smolts.org.signed";
|
||||
};
|
||||
zone "fedoracommunity.org" {
|
||||
type master;
|
||||
file "master/fedoracommunity.org.signed";
|
||||
file "master/built/fedoracommunity.org.signed";
|
||||
};
|
||||
zone "nspluginwrapper.org" {
|
||||
type master;
|
||||
file "master/nspluginwrapper.org.signed";
|
||||
file "master/built/nspluginwrapper.org.signed";
|
||||
};
|
||||
zone "k12linux.org" {
|
||||
type master;
|
||||
file "master/k12linux.org.signed";
|
||||
file "master/built/k12linux.org.signed";
|
||||
};
|
||||
zone "projectofedora.org" {
|
||||
type master;
|
||||
file "master/projectofedora.org.signed";
|
||||
file "master/built/projectofedora.org.signed";
|
||||
};
|
||||
zone "168.192.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/168.192.in-addr.arpa.signed";
|
||||
file "master/built/168.192.in-addr.arpa.signed";
|
||||
};
|
||||
zone "2.203.67.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/2.203.67.in-addr.arpa";
|
||||
file "master/built/2.203.67.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "184.132.209.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/184.132.209.in-addr.arpa";
|
||||
file "master/built/184.132.209.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "192-255.169.211.140.in-addr.arpa" {
|
||||
type master;
|
||||
file "master/192-255.169.211.140.in-addr.arpa";
|
||||
file "master/built/192-255.169.211.140.in-addr.arpa";
|
||||
};
|
||||
|
||||
zone "port389.org" {
|
||||
type master;
|
||||
file "master/port389.org.signed";
|
||||
file "master/built/port389.org.signed";
|
||||
};
|
||||
|
||||
zone "389tcp.org" {
|
||||
type master;
|
||||
file "master/389tcp.org.signed";
|
||||
file "master/built/389tcp.org.signed";
|
||||
};
|
||||
|
||||
zone "fpaste.org" {
|
||||
type master;
|
||||
file "master/fpaste.org";
|
||||
file "master/built/fpaste.org";
|
||||
};
|
||||
|
||||
//
|
||||
|
|
@ -137,113 +137,113 @@ zone "fpaste.org" {
|
|||
|
||||
zone "fedora-bd.org" {
|
||||
type master;
|
||||
file "master/fedora-bd.org";
|
||||
file "master/built/fedora-bd.org";
|
||||
};
|
||||
zone "fedora.asia" {
|
||||
type master;
|
||||
file "master/fedora.asia";
|
||||
file "master/built/fedora.asia";
|
||||
};
|
||||
zone "fedora.cr" {
|
||||
type master;
|
||||
file "master/fedora.cr";
|
||||
file "master/built/fedora.cr";
|
||||
};
|
||||
zone "fedora.me" {
|
||||
type master;
|
||||
file "master/fedora.me";
|
||||
file "master/built/fedora.me";
|
||||
};
|
||||
zone "fedora.mobi" {
|
||||
type master;
|
||||
file "master/fedora.mobi";
|
||||
file "master/built/fedora.mobi";
|
||||
};
|
||||
zone "fedora.org.cn" {
|
||||
type master;
|
||||
file "master/fedora.org.cn";
|
||||
file "master/built/fedora.org.cn";
|
||||
};
|
||||
zone "fedora.pe" {
|
||||
type master;
|
||||
file "master/fedora.pe";
|
||||
file "master/built/fedora.pe";
|
||||
};
|
||||
zone "fedora.tk" {
|
||||
type master;
|
||||
file "master/fedora.tk";
|
||||
file "master/built/fedora.tk";
|
||||
};
|
||||
zone "fedora.xxx" {
|
||||
type master;
|
||||
file "master/fedora.xxx";
|
||||
file "master/built/fedora.xxx";
|
||||
};
|
||||
zone "fedoramirror.net" {
|
||||
type master;
|
||||
file "master/fedoramirror.net";
|
||||
file "master/built/fedoramirror.net";
|
||||
};
|
||||
zone "fedoraproject.asia" {
|
||||
type master;
|
||||
file "master/fedoraproject.asia";
|
||||
file "master/built/fedoraproject.asia";
|
||||
};
|
||||
zone "fedoraproject.cn" {
|
||||
type master;
|
||||
file "master/fedoraproject.cn";
|
||||
file "master/built/fedoraproject.cn";
|
||||
};
|
||||
zone "fedoraproject.com.cn" {
|
||||
type master;
|
||||
file "master/fedoraproject.com.cn";
|
||||
file "master/built/fedoraproject.com.cn";
|
||||
};
|
||||
zone "fedoraproject.com.gr" {
|
||||
type master;
|
||||
file "master/fedoraproject.com.gr";
|
||||
file "master/built/fedoraproject.com.gr";
|
||||
};
|
||||
zone "fedoraproject.cz" {
|
||||
type master;
|
||||
file "master/fedoraproject.cz";
|
||||
file "master/built/fedoraproject.cz";
|
||||
};
|
||||
zone "fedoraproject.eu" {
|
||||
type master;
|
||||
file "master/fedoraproject.eu";
|
||||
file "master/built/fedoraproject.eu";
|
||||
};
|
||||
zone "fedoraproject.gr" {
|
||||
type master;
|
||||
file "master/fedoraproject.gr";
|
||||
file "master/built/fedoraproject.gr";
|
||||
};
|
||||
zone "fedoraproject.my" {
|
||||
type master;
|
||||
file "master/fedoraproject.my";
|
||||
file "master/built/fedoraproject.my";
|
||||
};
|
||||
zone "fedoraproject.net.cn" {
|
||||
type master;
|
||||
file "master/fedoraproject.net.cn";
|
||||
file "master/built/fedoraproject.net.cn";
|
||||
};
|
||||
zone "fedoraproject.pe" {
|
||||
type master;
|
||||
file "master/fedoraproject.pe";
|
||||
file "master/built/fedoraproject.pe";
|
||||
};
|
||||
zone "fedoraproject.xxx" {
|
||||
type master;
|
||||
file "master/fedoraproject.xxx";
|
||||
file "master/built/fedoraproject.xxx";
|
||||
};
|
||||
zone "fedorasucks.com" {
|
||||
type master;
|
||||
file "master/fedorasucks.com";
|
||||
file "master/built/fedorasucks.com";
|
||||
};
|
||||
zone "firewalld.org" {
|
||||
type master;
|
||||
file "master/firewalld.org";
|
||||
file "master/built/firewalld.org";
|
||||
};
|
||||
zone "spreadfedora.com" {
|
||||
type master;
|
||||
file "master/spreadfedora.com";
|
||||
file "master/built/spreadfedora.com";
|
||||
};
|
||||
zone "flocktofedora.com" {
|
||||
type master;
|
||||
file "master/flocktofedora.com";
|
||||
file "master/built/flocktofedora.com";
|
||||
};
|
||||
zone "flocktofedora.org" {
|
||||
type master;
|
||||
file "master/flocktofedora.org";
|
||||
file "master/built/flocktofedora.org";
|
||||
};
|
||||
zone "flocktofedora.net" {
|
||||
type master;
|
||||
file "master/flocktofedora.net";
|
||||
file "master/built/flocktofedora.net";
|
||||
};
|
||||
zone "release-monitoring.org" {
|
||||
type master;
|
||||
file "master/release-monitoring.org";
|
||||
file "master/built/release-monitoring.org";
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue