aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2017-12-06 18:32:40 +0000
committerPascal Terjan <pterjan@mageia.org>2017-12-06 18:32:57 +0000
commitaf69dbe15699a44ab6ab20ff28fa42ff2c4c932c (patch)
tree41a57441a994c9f1980a972adc1bbcf70dff8133
parent070b62491305fdad965d6c476b44a514bb86b76c (diff)
downloadpuppet-af69dbe15699a44ab6ab20ff28fa42ff2c4c932c.tar
puppet-af69dbe15699a44ab6ab20ff28fa42ff2c4c932c.tar.gz
puppet-af69dbe15699a44ab6ab20ff28fa42ff2c4c932c.tar.bz2
puppet-af69dbe15699a44ab6ab20ff28fa42ff2c4c932c.tar.xz
puppet-af69dbe15699a44ab6ab20ff28fa42ff2c4c932c.zip
Move remaining stuff from champagne to neru
-rwxr-xr-xdeployment/dns/templates/mageia.org.zone12
1 files changed, 6 insertions, 6 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index 22737256..0b094a1c 100755
--- 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. (
- 2017120604 ; Serial
+ 2017120605 ; Serial
7200 ; Refresh
3600 ; Retry
86400 ; Expire
@@ -56,9 +56,10 @@ ns0 IN AAAA <%= nodes['sucuk']['ipv6'] %>
ns1 IN A <%= nodes['neru']['ipv4'] %>
ns1 IN AAAA <%= nodes['neru']['ipv6'] %>
-; mageia.org set to IP of champagne :
-mageia.org. IN A <%= nodes['champagne']['ipv4'] %>
-www-zarb IN A 212.85.158.22
+; mageia.org set to IP of neru
+mageia.org. IN A <%= nodes['neru']['ipv4'] %>
+mageia.org. IN AAAA <%= nodes['neru']['ipv4'] %>
+
; madb on mageia.madb.org
madb IN A 163.172.201.211
@@ -70,8 +71,6 @@ torrent IN A <%= nodes['alamut']['ipv4'] %>
torrent IN AAAA <%= nodes['alamut']['ipv6'] %>
; aliases
-www-test IN CNAME champagne
-
meetbot IN CNAME krampouezh
ldap-slave-1 IN CNAME krampouezh
@@ -84,6 +83,7 @@ planet IN CNAME neru
releases IN CNAME neru
start IN CNAME neru
static IN CNAME neru
+www-test IN CNAME neru
rsync IN CNAME duvel
svn IN CNAME duvel