diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110113/bbe81844')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment-0001.html | 470 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment.html | 470 |
2 files changed, 940 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment-0001.html new file mode 100644 index 000000000..b7c3596f6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment-0001.html @@ -0,0 +1,470 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[775] move dns zone to a module in deployment</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>775</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2011-01-13 19:12:25 +0100 (Thu, 13 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>move dns zone to a module in deployment</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestscommonpp">puppet/manifests/common.pp</a></li> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li>puppet/deployment/dns/</li> +<li>puppet/deployment/dns/manifests/</li> +<li><a href="#puppetdeploymentdnsmanifestsinitpp">puppet/deployment/dns/manifests/init.pp</a></li> +<li>puppet/deployment/dns/templates/</li> +<li><a href="#puppetdeploymentdnstemplates70002000871220a2ip6arpazone">puppet/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone</a></li> +<li><a href="#puppetdeploymentdnstemplatesmageiafrzone">puppet/deployment/dns/templates/mageia.fr.zone</a></li> +<li><a href="#puppetdeploymentdnstemplatesmageiaorgzone">puppet/deployment/dns/templates/mageia.org.zone</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulesbindtemplateszones70002000871220a2ip6arpazone">puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone</a></li> +<li><a href="#puppetmodulesbindtemplateszonesmageiafrzone">puppet/modules/bind/templates/zones/mageia.fr.zone</a></li> +<li><a href="#puppetmodulesbindtemplateszonesmageiaorgzone">puppet/modules/bind/templates/zones/mageia.org.zone</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetdeploymentdnsmanifestsinitpp">Added: puppet/deployment/dns/manifests/init.pp</a> +=================================================================== +--- 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") ++ } ++ } ++} + +<a id="puppetdeploymentdnstemplates70002000871220a2ip6arpazonefromrev774puppetmodulesbindtemplateszones70002000871220a2ip6arpazone">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)</a> +=================================================================== +--- 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. ++ + +<a id="puppetdeploymentdnstemplatesmageiafrzonefromrev774puppetmodulesbindtemplateszonesmageiafrzone">Copied: puppet/deployment/dns/templates/mageia.fr.zone (from rev 774, puppet/modules/bind/templates/zones/mageia.fr.zone)</a> +=================================================================== +--- 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. + +<a id="puppetdeploymentdnstemplatesmageiaorgzonefromrev774puppetmodulesbindtemplateszonesmageiaorgzone">Copied: puppet/deployment/dns/templates/mageia.org.zone (from rev 774, puppet/modules/bind/templates/zones/mageia.org.zone)</a> +=================================================================== +--- 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 + +<a id="puppetmanifestscommonpp">Modified: puppet/manifests/common.pp</a> +=================================================================== +--- 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": } +-} ++ + +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- 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 + +<a id="puppetmodulesbindtemplateszones70002000871220a2ip6arpazone">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</a> +=================================================================== +--- 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. +- + +<a id="puppetmodulesbindtemplateszonesmageiafrzone">Deleted: puppet/modules/bind/templates/zones/mageia.fr.zone</a> +=================================================================== +--- 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. + +<a id="puppetmodulesbindtemplateszonesmageiaorgzone">Deleted: puppet/modules/bind/templates/zones/mageia.org.zone</a> +=================================================================== +--- 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 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment.html new file mode 100644 index 000000000..b7c3596f6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110113/bbe81844/attachment.html @@ -0,0 +1,470 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[775] move dns zone to a module in deployment</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>775</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2011-01-13 19:12:25 +0100 (Thu, 13 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>move dns zone to a module in deployment</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestscommonpp">puppet/manifests/common.pp</a></li> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li>puppet/deployment/dns/</li> +<li>puppet/deployment/dns/manifests/</li> +<li><a href="#puppetdeploymentdnsmanifestsinitpp">puppet/deployment/dns/manifests/init.pp</a></li> +<li>puppet/deployment/dns/templates/</li> +<li><a href="#puppetdeploymentdnstemplates70002000871220a2ip6arpazone">puppet/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone</a></li> +<li><a href="#puppetdeploymentdnstemplatesmageiafrzone">puppet/deployment/dns/templates/mageia.fr.zone</a></li> +<li><a href="#puppetdeploymentdnstemplatesmageiaorgzone">puppet/deployment/dns/templates/mageia.org.zone</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulesbindtemplateszones70002000871220a2ip6arpazone">puppet/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone</a></li> +<li><a href="#puppetmodulesbindtemplateszonesmageiafrzone">puppet/modules/bind/templates/zones/mageia.fr.zone</a></li> +<li><a href="#puppetmodulesbindtemplateszonesmageiaorgzone">puppet/modules/bind/templates/zones/mageia.org.zone</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetdeploymentdnsmanifestsinitpp">Added: puppet/deployment/dns/manifests/init.pp</a> +=================================================================== +--- 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") ++ } ++ } ++} + +<a id="puppetdeploymentdnstemplates70002000871220a2ip6arpazonefromrev774puppetmodulesbindtemplateszones70002000871220a2ip6arpazone">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)</a> +=================================================================== +--- 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. ++ + +<a id="puppetdeploymentdnstemplatesmageiafrzonefromrev774puppetmodulesbindtemplateszonesmageiafrzone">Copied: puppet/deployment/dns/templates/mageia.fr.zone (from rev 774, puppet/modules/bind/templates/zones/mageia.fr.zone)</a> +=================================================================== +--- 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. + +<a id="puppetdeploymentdnstemplatesmageiaorgzonefromrev774puppetmodulesbindtemplateszonesmageiaorgzone">Copied: puppet/deployment/dns/templates/mageia.org.zone (from rev 774, puppet/modules/bind/templates/zones/mageia.org.zone)</a> +=================================================================== +--- 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 + +<a id="puppetmanifestscommonpp">Modified: puppet/manifests/common.pp</a> +=================================================================== +--- 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": } +-} ++ + +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- 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 + +<a id="puppetmodulesbindtemplateszones70002000871220a2ip6arpazone">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</a> +=================================================================== +--- 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. +- + +<a id="puppetmodulesbindtemplateszonesmageiafrzone">Deleted: puppet/modules/bind/templates/zones/mageia.fr.zone</a> +=================================================================== +--- 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. + +<a id="puppetmodulesbindtemplateszonesmageiaorgzone">Deleted: puppet/modules/bind/templates/zones/mageia.org.zone</a> +=================================================================== +--- 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 + +</pre></div> + +</body> +</html>
\ No newline at end of file |