Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Kevin Fenzi 2014-12-07 00:38:30 +00:00
commit 542f145f21
3 changed files with 96 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

53
roles/dns/files/named.conf
View file

@ -49,12 +49,11 @@ options {
}; };
notify yes; notify yes;
minimal-responses yes; minimal-responses yes;
// internal nameservers shouldn't ratelimit
// rate-limit requests // rate-limit requests
//rate-limit { rate-limit {
// responses-per-second 25; responses-per-second 25;
// window 5; window 5;
//}; };
}; };
// //
logging { logging {
@ -139,73 +138,73 @@ view "PHX2" {
zone "qa.fedoraproject.org" { zone "qa.fedoraproject.org" {
type master; type master;
file "master/qa.fedoraproject.org"; file "master/built/qa.fedoraproject.org";
}; };
zone "phx2.fedoraproject.org" { zone "phx2.fedoraproject.org" {
type master; type master;
file "master/phx2.fedoraproject.org"; file "master/built/phx2.fedoraproject.org";
}; };
zone "mgmt.fedoraproject.org" { zone "mgmt.fedoraproject.org" {
type master; type master;
file "master/mgmt.fedoraproject.org"; file "master/built/mgmt.fedoraproject.org";
}; };
zone "arm.fedoraproject.org" { zone "arm.fedoraproject.org" {
type master; type master;
file "master/arm.fedoraproject.org"; file "master/built/arm.fedoraproject.org";
}; };
zone "78.5.10.in-addr.arpa" { zone "78.5.10.in-addr.arpa" {
type master; 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" { zone "79.5.10.in-addr.arpa" {
type master; 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" { zone "124.5.10.in-addr.arpa" {
type master; 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" { zone "125.5.10.in-addr.arpa" {
type master; 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" { zone "126.5.10.in-addr.arpa" {
type master; 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" { zone "127.5.10.in-addr.arpa" {
type master; 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" { zone "128.5.10.in-addr.arpa" {
type master; 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" { zone "130.5.10.in-addr.arpa" {
type master; 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" { zone "131.5.10.in-addr.arpa" {
type master; type master;
file "master/131.5.10.in-addr.arpa"; file "master/built/131.5.10.in-addr.arpa";
}; };
zone "fedoraproject.org" { zone "fedoraproject.org" {
type master; type master;
file "master/DEFAULT/fedoraproject.org.signed"; file "master/built/DEFAULT/fedoraproject.org.signed";
}; };
include "etc/zones.conf"; include "etc/zones.conf";
@ -218,11 +217,11 @@ view "NA" {
recursion no; recursion no;
zone "fedoraproject.org" { zone "fedoraproject.org" {
type master; type master;
file "master/NA/fedoraproject.org.signed"; file "master/built/NA/fedoraproject.org.signed";
}; };
zone "cloud.fedoraproject.org" { zone "cloud.fedoraproject.org" {
type master; type master;
file "master/NA/cloud.fedoraproject.org.signed"; file "master/built/NA/cloud.fedoraproject.org.signed";
}; };
include "etc/zones.conf"; include "etc/zones.conf";
}; };
@ -232,11 +231,11 @@ view "GB" {
recursion no; recursion no;
zone "fedoraproject.org" { zone "fedoraproject.org" {
type master; type master;
file "master/GB/fedoraproject.org.signed"; file "master/built/GB/fedoraproject.org.signed";
}; };
zone "cloud.fedoraproject.org" { zone "cloud.fedoraproject.org" {
type master; type master;
file "master/GB/cloud.fedoraproject.org.signed"; file "master/built/GB/cloud.fedoraproject.org.signed";
}; };
include "etc/zones.conf"; include "etc/zones.conf";
}; };
@ -248,11 +247,11 @@ view "EU" {
recursion no; recursion no;
zone "fedoraproject.org" { zone "fedoraproject.org" {
type master; type master;
file "master/EU/fedoraproject.org.signed"; file "master/built/EU/fedoraproject.org.signed";
}; };
zone "cloud.fedoraproject.org" { zone "cloud.fedoraproject.org" {
type master; type master;
file "master/EU/cloud.fedoraproject.org.signed"; file "master/built/EU/cloud.fedoraproject.org.signed";
}; };
include "etc/zones.conf"; include "etc/zones.conf";
}; };
@ -263,11 +262,11 @@ view "DEFAULT" {
recursion no; recursion no;
zone "fedoraproject.org" { zone "fedoraproject.org" {
type master; type master;
file "master/DEFAULT/fedoraproject.org.signed"; file "master/built/DEFAULT/fedoraproject.org.signed";
}; };
zone "cloud.fedoraproject.org" { zone "cloud.fedoraproject.org" {
type master; type master;
file "master/DEFAULT/cloud.fedoraproject.org.signed"; file "master/built/DEFAULT/cloud.fedoraproject.org.signed";
}; };
include "etc/zones.conf"; include "etc/zones.conf";
}; };

40
roles/dns/files/update-dns
View file

@ -1,34 +1,18 @@
#!/bin/bash #!/bin/bash
tmpdir=`mktemp -d`
dnsgit='https://infrastructure.fedoraproject.org/infra/dns.git' dnsgit='https://infrastructure.fedoraproject.org/infra/dns.git'
destdir='/var/named/chroot/master/' destdir='/var/named/chroot/master/'
if [ -d $destdir ];
then
cd $destdir
git pull -X theirs
else
git clone $dnsgit $destdir
fi
cd $tmpdir cd $tmpdir
# clone the dnsgit repo # change context so the chroot can cope
git clone $dnsgit >> /dev/null chown -R named.named $destdir
if [ $? != 0 ]; then chcon -u system_u $destdir/* $destdir/*/*
echo "Error cloning dns git repo" # reload named
exit 1 /sbin/service named reload
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

116
roles/dns/files/zones.conf
View file

@ -4,131 +4,131 @@ zone "." {
}; };
zone "fedora.us" { zone "fedora.us" {
type master; type master;
file "master/fedora.us.signed"; file "master/built/fedora.us.signed";
}; };
zone "fedora.my" { zone "fedora.my" {
type master; type master;
file "master/fedora.my"; file "master/built/fedora.my";
}; };
zone "fedora.com.my" { zone "fedora.com.my" {
type master; type master;
file "master/fedora.com.my"; file "master/built/fedora.com.my";
}; };
zone "fedora.pt" { zone "fedora.pt" {
type master; type master;
file "master/fedora.pt"; file "master/built/fedora.pt";
}; };
zone "fedoralinux.com" { zone "fedoralinux.com" {
type master; type master;
file "master/fedoralinux.com.signed"; file "master/built/fedoralinux.com.signed";
}; };
zone "fedoralinux.net" { zone "fedoralinux.net" {
type master; type master;
file "master/fedoralinux.net.signed"; file "master/built/fedoralinux.net.signed";
}; };
zone "fedoralinux.org" { zone "fedoralinux.org" {
type master; type master;
file "master/fedoralinux.org.signed"; file "master/built/fedoralinux.org.signed";
}; };
zone "fedoramagazine.org" { zone "fedoramagazine.org" {
type master; type master;
file "master/fedoramagazine.org.signed"; file "master/built/fedoramagazine.org.signed";
}; };
zone "fedoraproject.com" { zone "fedoraproject.com" {
type master; type master;
file "master/fedoraproject.com.signed"; file "master/built/fedoraproject.com.signed";
}; };
zone "fedoraproject.com.my" { zone "fedoraproject.com.my" {
type master; type master;
file "master/fedoraproject.com.my"; file "master/built/fedoraproject.com.my";
}; };
zone "fedoraproject.su" { zone "fedoraproject.su" {
type master; type master;
file "master/fedoraproject.su"; file "master/built/fedoraproject.su";
}; };
zone "fedoraproject.net" { zone "fedoraproject.net" {
type master; type master;
file "master/fedoraproject.net.signed"; file "master/built/fedoraproject.net.signed";
}; };
zone "fedoraproject.co.uk" { zone "fedoraproject.co.uk" {
type master; type master;
file "master/fedoraproject.co.uk"; file "master/built/fedoraproject.co.uk";
}; };
zone "fedorahosted.org" { zone "fedorahosted.org" {
type master; type master;
file "master/fedorahosted.org.signed"; file "master/built/fedorahosted.org.signed";
}; };
//zone "fedoraproject.org" { //zone "fedoraproject.org" {
// type master; // type master;
// file "master/fedoraproject.org.signed"; // file "master/built/fedoraproject.org.signed";
//}; //};
zone "vpn.fedoraproject.org" { zone "vpn.fedoraproject.org" {
type master; type master;
file "master/vpn.fedoraproject.org.signed"; file "master/built/vpn.fedoraproject.org.signed";
}; };
zone "fedorapeople.org" { zone "fedorapeople.org" {
type master; type master;
file "master/fedorapeople.org.signed"; file "master/built/fedorapeople.org.signed";
}; };
zone "fedoraproject.org.uk" { zone "fedoraproject.org.uk" {
type master; type master;
file "master/fedoraproject.org.uk.signed"; file "master/built/fedoraproject.org.uk.signed";
}; };
zone "smolts.org" { zone "smolts.org" {
type master; type master;
file "master/smolts.org.signed"; file "master/built/smolts.org.signed";
}; };
zone "fedoracommunity.org" { zone "fedoracommunity.org" {
type master; type master;
file "master/fedoracommunity.org.signed"; file "master/built/fedoracommunity.org.signed";
}; };
zone "nspluginwrapper.org" { zone "nspluginwrapper.org" {
type master; type master;
file "master/nspluginwrapper.org.signed"; file "master/built/nspluginwrapper.org.signed";
}; };
zone "k12linux.org" { zone "k12linux.org" {
type master; type master;
file "master/k12linux.org.signed"; file "master/built/k12linux.org.signed";
}; };
zone "projectofedora.org" { zone "projectofedora.org" {
type master; type master;
file "master/projectofedora.org.signed"; file "master/built/projectofedora.org.signed";
}; };
zone "168.192.in-addr.arpa" { zone "168.192.in-addr.arpa" {
type master; 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" { zone "2.203.67.in-addr.arpa" {
type master; 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" { zone "184.132.209.in-addr.arpa" {
type master; 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" { zone "192-255.169.211.140.in-addr.arpa" {
type master; 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" { zone "port389.org" {
type master; type master;
file "master/port389.org.signed"; file "master/built/port389.org.signed";
}; };
zone "389tcp.org" { zone "389tcp.org" {
type master; type master;
file "master/389tcp.org.signed"; file "master/built/389tcp.org.signed";
}; };
zone "fpaste.org" { zone "fpaste.org" {
type master; type master;
file "master/fpaste.org"; file "master/built/fpaste.org";
}; };
// //
@ -137,113 +137,113 @@ zone "fpaste.org" {
zone "fedora-bd.org" { zone "fedora-bd.org" {
type master; type master;
file "master/fedora-bd.org"; file "master/built/fedora-bd.org";
}; };
zone "fedora.asia" { zone "fedora.asia" {
type master; type master;
file "master/fedora.asia"; file "master/built/fedora.asia";
}; };
zone "fedora.cr" { zone "fedora.cr" {
type master; type master;
file "master/fedora.cr"; file "master/built/fedora.cr";
}; };
zone "fedora.me" { zone "fedora.me" {
type master; type master;
file "master/fedora.me"; file "master/built/fedora.me";
}; };
zone "fedora.mobi" { zone "fedora.mobi" {
type master; type master;
file "master/fedora.mobi"; file "master/built/fedora.mobi";
}; };
zone "fedora.org.cn" { zone "fedora.org.cn" {
type master; type master;
file "master/fedora.org.cn"; file "master/built/fedora.org.cn";
}; };
zone "fedora.pe" { zone "fedora.pe" {
type master; type master;
file "master/fedora.pe"; file "master/built/fedora.pe";
}; };
zone "fedora.tk" { zone "fedora.tk" {
type master; type master;
file "master/fedora.tk"; file "master/built/fedora.tk";
}; };
zone "fedora.xxx" { zone "fedora.xxx" {
type master; type master;
file "master/fedora.xxx"; file "master/built/fedora.xxx";
}; };
zone "fedoramirror.net" { zone "fedoramirror.net" {
type master; type master;
file "master/fedoramirror.net"; file "master/built/fedoramirror.net";
}; };
zone "fedoraproject.asia" { zone "fedoraproject.asia" {
type master; type master;
file "master/fedoraproject.asia"; file "master/built/fedoraproject.asia";
}; };
zone "fedoraproject.cn" { zone "fedoraproject.cn" {
type master; type master;
file "master/fedoraproject.cn"; file "master/built/fedoraproject.cn";
}; };
zone "fedoraproject.com.cn" { zone "fedoraproject.com.cn" {
type master; type master;
file "master/fedoraproject.com.cn"; file "master/built/fedoraproject.com.cn";
}; };
zone "fedoraproject.com.gr" { zone "fedoraproject.com.gr" {
type master; type master;
file "master/fedoraproject.com.gr"; file "master/built/fedoraproject.com.gr";
}; };
zone "fedoraproject.cz" { zone "fedoraproject.cz" {
type master; type master;
file "master/fedoraproject.cz"; file "master/built/fedoraproject.cz";
}; };
zone "fedoraproject.eu" { zone "fedoraproject.eu" {
type master; type master;
file "master/fedoraproject.eu"; file "master/built/fedoraproject.eu";
}; };
zone "fedoraproject.gr" { zone "fedoraproject.gr" {
type master; type master;
file "master/fedoraproject.gr"; file "master/built/fedoraproject.gr";
}; };
zone "fedoraproject.my" { zone "fedoraproject.my" {
type master; type master;
file "master/fedoraproject.my"; file "master/built/fedoraproject.my";
}; };
zone "fedoraproject.net.cn" { zone "fedoraproject.net.cn" {
type master; type master;
file "master/fedoraproject.net.cn"; file "master/built/fedoraproject.net.cn";
}; };
zone "fedoraproject.pe" { zone "fedoraproject.pe" {
type master; type master;
file "master/fedoraproject.pe"; file "master/built/fedoraproject.pe";
}; };
zone "fedoraproject.xxx" { zone "fedoraproject.xxx" {
type master; type master;
file "master/fedoraproject.xxx"; file "master/built/fedoraproject.xxx";
}; };
zone "fedorasucks.com" { zone "fedorasucks.com" {
type master; type master;
file "master/fedorasucks.com"; file "master/built/fedorasucks.com";
}; };
zone "firewalld.org" { zone "firewalld.org" {
type master; type master;
file "master/firewalld.org"; file "master/built/firewalld.org";
}; };
zone "spreadfedora.com" { zone "spreadfedora.com" {
type master; type master;
file "master/spreadfedora.com"; file "master/built/spreadfedora.com";
}; };
zone "flocktofedora.com" { zone "flocktofedora.com" {
type master; type master;
file "master/flocktofedora.com"; file "master/built/flocktofedora.com";
}; };
zone "flocktofedora.org" { zone "flocktofedora.org" {
type master; type master;
file "master/flocktofedora.org"; file "master/built/flocktofedora.org";
}; };
zone "flocktofedora.net" { zone "flocktofedora.net" {
type master; type master;
file "master/flocktofedora.net"; file "master/built/flocktofedora.net";
}; };
zone "release-monitoring.org" { zone "release-monitoring.org" {
type master; type master;
file "master/release-monitoring.org"; file "master/built/release-monitoring.org";
}; };