diff options
| author | Thomas Backlund <tmb@mageia.org> | 2019-07-06 20:07:19 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2019-07-06 20:07:19 +0300 |
| commit | c7370364187f099a4d17be079674b7209064ad8a (patch) | |
| tree | e8e1c0d92e4e834480ddb2d43180b4afa1841de1 /deployment/dns | |
| parent | 08625db2309fa5cd5528ccfbbeb680da9d34e858 (diff) | |
| download | puppet-c7370364187f099a4d17be079674b7209064ad8a.tar puppet-c7370364187f099a4d17be079674b7209064ad8a.tar.gz puppet-c7370364187f099a4d17be079674b7209064ad8a.tar.bz2 puppet-c7370364187f099a4d17be079674b7209064ad8a.tar.xz puppet-c7370364187f099a4d17be079674b7209064ad8a.zip | |
drop obsolete alamut, jonund, valstar stuff
Diffstat (limited to 'deployment/dns')
| -rw-r--r-- | deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | deployment/dns/templates/mageia.org.zone | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone b/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone index db085396..6dfee4ff 100644 --- a/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone +++ b/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone @@ -1,6 +1,6 @@ $TTL 3D @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2016020501 ; Serial + 2019070601 ; Serial 3600 ; Refresh 3600 ; Retry 2419200 ; Expire @@ -12,10 +12,7 @@ $TTL 3D @ IN NS ns1.mageia.org. 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR gw-ipv6.mageia.org. -2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR alamut.mageia.org. -3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR valstar.mageia.org. 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR ecosse.mageia.org. -5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR jonund.mageia.org. 6.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR fiona.mageia.org. 7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR sucuk.mageia.org. 8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 IN PTR rabbit.mageia.org. diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index cda51417..e8a6b1f1 100755..100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -7,7 +7,7 @@ ; $Id$ $TTL 30m @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2019070301 ; Serial + 2019070601 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -44,10 +44,6 @@ group IN MX 20 neru.mageia.org. <%= nodes_txt %> ;SSHFP -alamut IN SSHFP 1 1 ef093dc95002c4af6623f02238749fd59fe81eec -alamut IN SSHFP 2 1 179cfa0660550698c4d98f488772b7c7896d96b5 -valstar IN SSHFP 1 1 f08e336f678d7c4a8772f17770976af7dd4d7a4f -valstar IN SSHFP 2 1 c0c45ed25aa8a9f1723a1ae077dcee61677a56a6 ; sucuk ns0 IN A <%= nodes['sucuk']['ipv4'] %> @@ -66,9 +62,6 @@ madb IN A 163.172.201.211 ; since we have a subdomain, we cannot use a CNAME ml IN A <%= nodes['sucuk']['ipv4'] %> ml IN AAAA <%= nodes['sucuk']['ipv6'] %> -; mga torrent server and tracker -torrent IN A <%= nodes['alamut']['ipv4'] %> -torrent IN AAAA <%= nodes['alamut']['ipv6'] %> ; aliases ldap-slave-1 IN CNAME neru @@ -98,11 +91,9 @@ ldap IN CNAME duvel ldap-master IN CNAME duvel advisories IN CNAME duvel projects IN CNAME duvel -pgsql IN CNAME alamut bcd IN CNAME rabbit epoll IN CNAME sucuk -tmp IN CNAME alamut forums IN CNAME sucuk forum IN CNAME sucuk @@ -124,8 +115,6 @@ www IN CNAME sucuk xymon IN CNAME sucuk ; build nodes aliases -jonund0 IN CNAME jonund -jonund1 IN CNAME jonund ecosse0 IN CNAME ecosse ecosse1 IN CNAME ecosse rabbit0 IN CNAME rabbit |