diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-01-17 18:53:33 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-01-17 18:53:33 +0000 |
| commit | 6d2ad4ba635e49ec0ebfb9cbb2044725dfe63803 (patch) | |
| tree | 166eabe43180e3a6b607896d6e2bd698514cd014 | |
| parent | 997d098d72f4d4f605d99bea83d18a158b5d0da2 (diff) | |
| download | puppet-6d2ad4ba635e49ec0ebfb9cbb2044725dfe63803.tar puppet-6d2ad4ba635e49ec0ebfb9cbb2044725dfe63803.tar.gz puppet-6d2ad4ba635e49ec0ebfb9cbb2044725dfe63803.tar.bz2 puppet-6d2ad4ba635e49ec0ebfb9cbb2044725dfe63803.tar.xz puppet-6d2ad4ba635e49ec0ebfb9cbb2044725dfe63803.zip | |
dns/mageia.org.zone: reorder host names definitions
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 3503c447..415d8d0c 100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -30,33 +30,16 @@ group IN MX 20 krampouezh.mageia.org. ; machines -; mageia.org set to IP of champagne : -mageia.org. IN A 217.70.188.116 -www-zarb IN A 212.85.158.22 - krampouezh IN A 95.142.164.207 krampouezh IN AAAA 2001:4b98:dc0:51:216:3eff:fe6b:4ea9 - champagne IN A 217.70.188.116 champagne IN AAAA 2001:4b98:dc0:41:216:3eff:fe4f:5a18 ; lost oasis alamut IN A 212.85.158.146 alamut IN AAAA 2a02:2178:2:7::2 -alamut IN SSHFP 1 1 ef093dc95002c4af6623f02238749fd59fe81eec -alamut IN SSHFP 2 1 179cfa0660550698c4d98f488772b7c7896d96b5 -; since we have a subdomain, we cannot use a CNAME -ml IN A 212.85.158.146 -ml IN AAAA 2a02:2178:2:7::2 -; mga torrent server and tracker -torrent IN A 212.85.158.146 -torrent IN AAAA 2a02:2178:2:7::2 - valstar IN A 212.85.158.147 valstar IN AAAA 2a02:2178:2:7::3 -valstar IN SSHFP 1 1 f08e336f678d7c4a8772f17770976af7dd4d7a4f -valstar IN SSHFP 2 1 c0c45ed25aa8a9f1723a1ae077dcee61677a56a6 - ecosse IN A 212.85.158.148 ecosse IN AAAA 2a02:2178:2:7::4 jonund IN A 212.85.158.149 @@ -67,15 +50,31 @@ sucuk IN A 212.85.158.151 sucuk IN AAAA 2a02:2178:2:7::7 rabbit IN A 212.85.158.152 rabbit IN AAAA 2a02:2178:2:7::8 - arm1 IN A 10.42.0.51 arm2 IN A 10.42.0.52 +;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 + ; alamut ns0 IN A <%= nodes['alamut']['ipv4'] %> ; krampouezh ns1 IN A <%= nodes['krampouezh']['ipv4'] %> +; mageia.org set to IP of champagne : +mageia.org. IN A 217.70.188.116 +www-zarb IN A 212.85.158.22 + +; since we have a subdomain, we cannot use a CNAME +ml IN A 212.85.158.146 +ml IN AAAA 2a02:2178:2:7::2 +; mga torrent server and tracker +torrent IN A 212.85.158.146 +torrent IN AAAA 2a02:2178:2:7::2 + ; aliases www IN CNAME champagne www-test IN CNAME champagne |