diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/002050.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2011-January/002050.html | 491 |
1 files changed, 491 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/002050.html b/zarb-ml/mageia-sysadm/2011-January/002050.html new file mode 100644 index 000000000..839d87115 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2011-January/002050.html @@ -0,0 +1,491 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [775] move dns zone to a module in deployment + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B775%5D%20move%20dns%20zone%20to%20a%20module%20in%20deployment&In-Reply-To=%3C20110113181225.EFD7C42377%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="002048.html"> + <LINK REL="Next" HREF="002049.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [775] move dns zone to a module in deployment</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B775%5D%20move%20dns%20zone%20to%20a%20module%20in%20deployment&In-Reply-To=%3C20110113181225.EFD7C42377%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [775] move dns zone to a module in deployment">root at mageia.org + </A><BR> + <I>Thu Jan 13 19:12:25 CET 2011</I> + <P><UL> + <LI>Previous message: <A HREF="002048.html">[Mageia-sysadm] [774] - allow to override the templates used for zone +</A></li> + <LI>Next message: <A HREF="002049.html">[Mageia-sysadm] [776] fix bcd problem of variable missing +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#2050">[ date ]</a> + <a href="thread.html#2050">[ thread ]</a> + <a href="subject.html#2050">[ subject ]</a> + <a href="author.html#2050">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 775 +Author: misc +Date: 2011-01-13 19:12:25 +0100 (Thu, 13 Jan 2011) +Log Message: +----------- +move dns zone to a module in deployment + +Modified Paths: +-------------- + puppet/manifests/common.pp + puppet/manifests/nodes.pp + +Added Paths: +----------- + puppet/deployment/dns/ + puppet/deployment/dns/manifests/ + puppet/deployment/dns/manifests/init.pp + puppet/deployment/dns/templates/ + puppet/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone + puppet/deployment/dns/templates/mageia.fr.zone + puppet/deployment/dns/templates/mageia.org.zone + +Removed Paths: +------------- + puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone + puppet/modules/bind/templates/zones/mageia.fr.zone + puppet/modules/bind/templates/zones/mageia.org.zone + +Added: puppet/deployment/dns/manifests/init.pp +=================================================================== +--- puppet/deployment/dns/manifests/init.pp (rev 0) ++++ puppet/deployment/dns/manifests/init.pp 2011-01-13 18:12:25 UTC (rev 775) +@@ -0,0 +1,22 @@ ++ ++class dns { ++ class server { ++ include bind::bind_master ++ dns::zone { "mageia.org": } ++ dns::zone { "mageia.fr": } ++ ++ dns::reverse_zone { "7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa": } ++ } ++ ++ define zone { ++ bind::zone_master { $name: ++ content => template("dns/$name.zone") ++ } ++ } ++ ++ define reverse_zone { ++ bind::zone_reverse { $name: ++ content => template("dns/$name.zone") ++ } ++ } ++} + +Copied: puppet/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone (from rev 774, puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone) +=================================================================== +--- puppet/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone (rev 0) ++++ puppet/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone 2011-01-13 18:12:25 UTC (rev 775) +@@ -0,0 +1,20 @@ ++$TTL 3D ++@ IN SOA ns0.mageia.org. root.mageia.org. ( ++ 2010120102 ; Serial ++ 3600 ; Refresh ++ 3600 ; Retry ++ 2419200 ; Expire ++ 86400 ; Minimum TTL ++) ++ ++; nameservers ++@ IN NS ns0.mageia.org. ++@ 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. ++ + +Copied: puppet/deployment/dns/templates/mageia.fr.zone (from rev 774, puppet/modules/bind/templates/zones/mageia.fr.zone) +=================================================================== +--- puppet/deployment/dns/templates/mageia.fr.zone (rev 0) ++++ puppet/deployment/dns/templates/mageia.fr.zone 2011-01-13 18:12:25 UTC (rev 775) +@@ -0,0 +1,27 @@ ++; cfengine-distributed file ++; local modifications will be lost ++; $Id$ ++$TTL 3D ++@ IN SOA ns0.mageia.org. mageia.fr. ( ++ 2010110200 ; Serial ++ 21600 ; Refresh ++ 3600 ; Retry ++ 2419200 ; Expire ++ 86400 ; Minmun TTL ++ ) ++ ++; nameservers ++@ IN NS ns0.mageia.org. ++@ IN NS ns1.mageia.org. ++ ++@ IN MX 10 mx0.zarb.org. ++@ IN MX 20 mx1.zarb.org. ++ ++; MX ++;@ IN MX 10 mx0.zarb.org. ++ ++; machines ++mageia.fr. IN A 212.85.158.22 ++ ++; aliases ++www IN CNAME mageia.fr. + +Copied: puppet/deployment/dns/templates/mageia.org.zone (from rev 774, puppet/modules/bind/templates/zones/mageia.org.zone) +=================================================================== +--- puppet/deployment/dns/templates/mageia.org.zone (rev 0) ++++ puppet/deployment/dns/templates/mageia.org.zone 2011-01-13 18:12:25 UTC (rev 775) +@@ -0,0 +1,92 @@ ++; puppet-distributed file ++; local modifications will be lost ++; $Id$ ++$TTL 1D ++@ IN SOA ns0.mageia.org. root.mageia.org. ( ++ 2011011001 ; Serial ++ 21600 ; Refresh ++ 3600 ; Retry ++ 2419200 ; Expire ++ 86400 ; Minmun TTL ++ ) ++ ++; nameservers ++@ IN NS ns0.mageia.org. ++@ IN NS ns1.mageia.org. ++ ++@ IN MX 10 mx0.zarb.org. ++@ IN MX 20 mx1.zarb.org. ++ ++ml IN MX 10 alamut.mageia.org. ++ml IN MX 20 krampouezh.mageia.org. ++ ++; MX ++;@ IN MX 10 mx0.zarb.org. ++ ++; machines ++mageia.org. IN A 212.85.158.22 ++www-zarb IN A 212.85.158.22 ++; gandi vm 1 ++vm-gandi IN A 95.142.164.207 ++kouign-amann IN A 95.142.164.207 ++krampouezh IN A 95.142.164.207 ++champagne IN A 217.70.188.116 ++ ++www-aufml IN A 91.121.11.63 ++forum IN A 88.191.127.89 ++ ++; lost oasis ++alamut IN A 212.85.158.146 ++alamut IN AAAA 2a02:2178:2:7::2 ++; 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 ++ ++valstar IN A 212.85.158.147 ++valstar IN AAAA 2a02:2178:2:7::3 ++ecosse IN A 212.85.158.148 ++ecosse IN AAAA 2a02:2178:2:7::4 ++jonund IN A 212.85.158.149 ++jonund IN AAAA 2a02:2178:2:7::5 ++fiona IN A 212.85.158.150 ++fiona IN AAAA 2a02:2178:2:7::6 ++ ++rabbit IN A 88.190.12.224 ++ ++ ++; alamut ++ns0 IN A 212.85.158.146 ++; krampouezh ++ns1 IN A 95.142.164.207 ++ ++; aliases ++www IN CNAME www-zarb ++www-test IN CNAME champagne ++blog IN CNAME www-zarb ++blog-test IN CNAME champagne ++rsync IN CNAME valstar ++ ++ldap IN CNAME valstar ++ ++svn IN CNAME valstar ++meetbot IN CNAME krampouezh ++ ++donate IN CNAME alamut ++donation IN CNAME alamut ++ ++puppetmaster IN CNAME valstar ++pkgsubmit IN CNAME valstar ++repository IN CNAME valstar ++ldap IN CNAME valstar ++ ++identity IN CNAME alamut ++identity-trunk IN CNAME alamut ++mirrors IN CNAME alamut ++epoll IN CNAME alamut ++pgsql IN CNAME alamut ++bugs IN CNAME alamut ++transifex IN CNAME alamut ++lists IN CNAME alamut ++; temporary ++;forum IN A 140.211.167.148 ++;wiki IN A 88.191.83.84 + +Modified: puppet/manifests/common.pp +=================================================================== +--- puppet/manifests/common.pp 2011-01-13 18:12:24 UTC (rev 774) ++++ puppet/manifests/common.pp 2011-01-13 18:12:25 UTC (rev 775) +@@ -109,9 +109,4 @@ + # include ssmtp + } + +-class dns_server { +- include bind::bind_master +- bind::zone_master { "mageia.org": } +- bind::zone_master { "mageia.fr": } +- bind::zone_reverse { "7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa": } +-} ++ + +Modified: puppet/manifests/nodes.pp +=================================================================== +--- puppet/manifests/nodes.pp 2011-01-13 18:12:24 UTC (rev 774) ++++ puppet/manifests/nodes.pp 2011-01-13 18:12:25 UTC (rev 775) +@@ -49,7 +49,6 @@ + # + include default_mageia_server_no_smtp + include postgresql::server +- include dns_server + timezone::timezone { "Europe/Paris": } + + include catdap +@@ -62,6 +61,7 @@ + include postfix::primary_smtp + + include lists ++ include dns::server + } + + # buildnode +@@ -108,7 +108,7 @@ + #include default_mageia_server_no_smtp + #include postfix::secondary_smtp + +- include dns_server ++ include dns::server + timezone::timezone { "Europe/Paris": } + # Other services running on this server : + # - meetbot + +Deleted: puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone +=================================================================== +--- puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone 2011-01-13 18:12:24 UTC (rev 774) ++++ puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone 2011-01-13 18:12:25 UTC (rev 775) +@@ -1,20 +0,0 @@ +-$TTL 3D +-@ IN SOA ns0.mageia.org. root.mageia.org. ( +- 2010120102 ; Serial +- 3600 ; Refresh +- 3600 ; Retry +- 2419200 ; Expire +- 86400 ; Minimum TTL +-) +- +-; nameservers +-@ IN NS ns0.mageia.org. +-@ 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. +- + +Deleted: puppet/modules/bind/templates/zones/mageia.fr.zone +=================================================================== +--- puppet/modules/bind/templates/zones/mageia.fr.zone 2011-01-13 18:12:24 UTC (rev 774) ++++ puppet/modules/bind/templates/zones/mageia.fr.zone 2011-01-13 18:12:25 UTC (rev 775) +@@ -1,27 +0,0 @@ +-; cfengine-distributed file +-; local modifications will be lost +-; $Id$ +-$TTL 3D +-@ IN SOA ns0.mageia.org. mageia.fr. ( +- 2010110200 ; Serial +- 21600 ; Refresh +- 3600 ; Retry +- 2419200 ; Expire +- 86400 ; Minmun TTL +- ) +- +-; nameservers +-@ IN NS ns0.mageia.org. +-@ IN NS ns1.mageia.org. +- +-@ IN MX 10 mx0.zarb.org. +-@ IN MX 20 mx1.zarb.org. +- +-; MX +-;@ IN MX 10 mx0.zarb.org. +- +-; machines +-mageia.fr. IN A 212.85.158.22 +- +-; aliases +-www IN CNAME mageia.fr. + +Deleted: puppet/modules/bind/templates/zones/mageia.org.zone +=================================================================== +--- puppet/modules/bind/templates/zones/mageia.org.zone 2011-01-13 18:12:24 UTC (rev 774) ++++ puppet/modules/bind/templates/zones/mageia.org.zone 2011-01-13 18:12:25 UTC (rev 775) +@@ -1,92 +0,0 @@ +-; puppet-distributed file +-; local modifications will be lost +-; $Id$ +-$TTL 1D +-@ IN SOA ns0.mageia.org. root.mageia.org. ( +- 2011011001 ; Serial +- 21600 ; Refresh +- 3600 ; Retry +- 2419200 ; Expire +- 86400 ; Minmun TTL +- ) +- +-; nameservers +-@ IN NS ns0.mageia.org. +-@ IN NS ns1.mageia.org. +- +-@ IN MX 10 mx0.zarb.org. +-@ IN MX 20 mx1.zarb.org. +- +-ml IN MX 10 alamut.mageia.org. +-ml IN MX 20 krampouezh.mageia.org. +- +-; MX +-;@ IN MX 10 mx0.zarb.org. +- +-; machines +-mageia.org. IN A 212.85.158.22 +-www-zarb IN A 212.85.158.22 +-; gandi vm 1 +-vm-gandi IN A 95.142.164.207 +-kouign-amann IN A 95.142.164.207 +-krampouezh IN A 95.142.164.207 +-champagne IN A 217.70.188.116 +- +-www-aufml IN A 91.121.11.63 +-forum IN A 88.191.127.89 +- +-; lost oasis +-alamut IN A 212.85.158.146 +-alamut IN AAAA 2a02:2178:2:7::2 +-; 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 +- +-valstar IN A 212.85.158.147 +-valstar IN AAAA 2a02:2178:2:7::3 +-ecosse IN A 212.85.158.148 +-ecosse IN AAAA 2a02:2178:2:7::4 +-jonund IN A 212.85.158.149 +-jonund IN AAAA 2a02:2178:2:7::5 +-fiona IN A 212.85.158.150 +-fiona IN AAAA 2a02:2178:2:7::6 +- +-rabbit IN A 88.190.12.224 +- +- +-; alamut +-ns0 IN A 212.85.158.146 +-; krampouezh +-ns1 IN A 95.142.164.207 +- +-; aliases +-www IN CNAME www-zarb +-www-test IN CNAME champagne +-blog IN CNAME www-zarb +-blog-test IN CNAME champagne +-rsync IN CNAME valstar +- +-ldap IN CNAME valstar +- +-svn IN CNAME valstar +-meetbot IN CNAME krampouezh +- +-donate IN CNAME alamut +-donation IN CNAME alamut +- +-puppetmaster IN CNAME valstar +-pkgsubmit IN CNAME valstar +-repository IN CNAME valstar +-ldap IN CNAME valstar +- +-identity IN CNAME alamut +-identity-trunk IN CNAME alamut +-mirrors IN CNAME alamut +-epoll IN CNAME alamut +-pgsql IN CNAME alamut +-bugs IN CNAME alamut +-transifex IN CNAME alamut +-lists IN CNAME alamut +-; temporary +-;forum IN A 140.211.167.148 +-;wiki IN A 88.191.83.84 +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20110113/bbe81844/attachment-0001.html> +</PRE> + + + + + + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="002048.html">[Mageia-sysadm] [774] - allow to override the templates used for zone +</A></li> + <LI>Next message: <A HREF="002049.html">[Mageia-sysadm] [776] fix bcd problem of variable missing +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#2050">[ date ]</a> + <a href="thread.html#2050">[ thread ]</a> + <a href="subject.html#2050">[ subject ]</a> + <a href="author.html#2050">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |