diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20101112 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101112')
28 files changed, 3886 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/069e880e/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/069e880e/attachment-0001.html new file mode 100644 index 000000000..ecc933ec6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/069e880e/attachment-0001.html @@ -0,0 +1,76 @@ +<!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>[250] include shorewall before shorewall::default_firewall</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>250</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:29:17 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>include shorewall before shorewall::default_firewall</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2010-11-12 20:57:58 UTC (rev 249) ++++ puppet/manifests/nodes.pp 2010-11-12 22:29:17 UTC (rev 250) +@@ -62,6 +62,7 @@ + include default_mageia_server + #include buildsystem::buildnode + timezone::timezone { "Europe/Paris": } ++ include shorewall + include shorewall::default_firewall + } + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/069e880e/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/069e880e/attachment.html new file mode 100644 index 000000000..ecc933ec6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/069e880e/attachment.html @@ -0,0 +1,76 @@ +<!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>[250] include shorewall before shorewall::default_firewall</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>250</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:29:17 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>include shorewall before shorewall::default_firewall</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2010-11-12 20:57:58 UTC (rev 249) ++++ puppet/manifests/nodes.pp 2010-11-12 22:29:17 UTC (rev 250) +@@ -62,6 +62,7 @@ + include default_mageia_server + #include buildsystem::buildnode + timezone::timezone { "Europe/Paris": } ++ include shorewall + include shorewall::default_firewall + } + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/4324c8f9/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/4324c8f9/attachment-0001.html new file mode 100644 index 000000000..a03461e21 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/4324c8f9/attachment-0001.html @@ -0,0 +1,107 @@ +<!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>[252] use shorewall for shorewall directory</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>252</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:33:33 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use shorewall for shorewall directory</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:29:49 UTC (rev 251) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:33:33 UTC (rev 252) +@@ -1,8 +1,10 @@ + class shorewall { + include concat::setup + ++ $shorewalldir = "/tmp/shorewall" ++ + define shorewallfile () { +- $filename = "/tmp/shorewall/${name}" ++ $filename = "${shorewalldir}/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -27,7 +29,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "/tmp/shorewall/rules" ++ $filename = "${shorewalldir}/rules" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -54,7 +56,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "/tmp/shorewall/zones" ++ $filename = "${shorewalldir}/zones" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -74,7 +76,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "/tmp/shorewall/policy" ++ $filename = "${shorewalldir}/policy" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/4324c8f9/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/4324c8f9/attachment.html new file mode 100644 index 000000000..a03461e21 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/4324c8f9/attachment.html @@ -0,0 +1,107 @@ +<!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>[252] use shorewall for shorewall directory</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>252</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:33:33 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use shorewall for shorewall directory</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:29:49 UTC (rev 251) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:33:33 UTC (rev 252) +@@ -1,8 +1,10 @@ + class shorewall { + include concat::setup + ++ $shorewalldir = "/tmp/shorewall" ++ + define shorewallfile () { +- $filename = "/tmp/shorewall/${name}" ++ $filename = "${shorewalldir}/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -27,7 +29,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "/tmp/shorewall/rules" ++ $filename = "${shorewalldir}/rules" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -54,7 +56,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "/tmp/shorewall/zones" ++ $filename = "${shorewalldir}/zones" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -74,7 +76,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "/tmp/shorewall/policy" ++ $filename = "${shorewalldir}/policy" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/80b09c3c/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/80b09c3c/attachment-0001.html new file mode 100644 index 000000000..e7d5284e3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/80b09c3c/attachment-0001.html @@ -0,0 +1,98 @@ +<!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>[247] fix syntax</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>247</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:49:14 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix syntax</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:50 UTC (rev 246) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:49:14 UTC (rev 247) +@@ -66,10 +66,10 @@ + } + class default_zones { + zone_line { "net ipv4": +- $order => 2, ++ order => 2, + } + zone_line { "fw firewall": +- $order => 3, ++ order => 3, + } + } + +@@ -86,13 +86,13 @@ + } + class default_policy { + policy_line{ "fw net ACCEPT": +- $order => 2, ++ order => 2, + } + policy_line{ "net all DROP info": +- $order => 3, ++ order => 3, + } + policy_line{ "all all REJECT info": +- $order => 4, ++ order => 4, + } + } + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/80b09c3c/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/80b09c3c/attachment.html new file mode 100644 index 000000000..e7d5284e3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/80b09c3c/attachment.html @@ -0,0 +1,98 @@ +<!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>[247] fix syntax</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>247</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:49:14 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix syntax</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:50 UTC (rev 246) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:49:14 UTC (rev 247) +@@ -66,10 +66,10 @@ + } + class default_zones { + zone_line { "net ipv4": +- $order => 2, ++ order => 2, + } + zone_line { "fw firewall": +- $order => 3, ++ order => 3, + } + } + +@@ -86,13 +86,13 @@ + } + class default_policy { + policy_line{ "fw net ACCEPT": +- $order => 2, ++ order => 2, + } + policy_line{ "net all DROP info": +- $order => 3, ++ order => 3, + } + policy_line{ "all all REJECT info": +- $order => 4, ++ order => 4, + } + } + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/8768fdcd/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/8768fdcd/attachment-0001.html new file mode 100644 index 000000000..44232d3ee --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/8768fdcd/attachment-0001.html @@ -0,0 +1,107 @@ +<!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>[253] don't use a variable for shorewall dir (not working)</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>253</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:36:51 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>don't use a variable for shorewall dir (not working)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:33:33 UTC (rev 252) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:36:51 UTC (rev 253) +@@ -1,10 +1,8 @@ + class shorewall { + include concat::setup + +- $shorewalldir = "/tmp/shorewall" +- + define shorewallfile () { +- $filename = "${shorewalldir}/${name}" ++ $filename = "/tmp/shorewall/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -29,7 +27,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "${shorewalldir}/rules" ++ $filename = "/tmp/shorewall/rules" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -56,7 +54,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "${shorewalldir}/zones" ++ $filename = "/tmp/shorewall/zones" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -76,7 +74,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "${shorewalldir}/policy" ++ $filename = "/tmp/shorewall/policy" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/8768fdcd/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/8768fdcd/attachment.html new file mode 100644 index 000000000..44232d3ee --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/8768fdcd/attachment.html @@ -0,0 +1,107 @@ +<!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>[253] don't use a variable for shorewall dir (not working)</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>253</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:36:51 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>don't use a variable for shorewall dir (not working)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:33:33 UTC (rev 252) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:36:51 UTC (rev 253) +@@ -1,10 +1,8 @@ + class shorewall { + include concat::setup + +- $shorewalldir = "/tmp/shorewall" +- + define shorewallfile () { +- $filename = "${shorewalldir}/${name}" ++ $filename = "/tmp/shorewall/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -29,7 +27,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "${shorewalldir}/rules" ++ $filename = "/tmp/shorewall/rules" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -56,7 +54,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "${shorewalldir}/zones" ++ $filename = "/tmp/shorewall/zones" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, +@@ -76,7 +74,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "${shorewalldir}/policy" ++ $filename = "/tmp/shorewall/policy" + $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/9705c3c6/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/9705c3c6/attachment-0001.html new file mode 100644 index 000000000..71daa37a9 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/9705c3c6/attachment-0001.html @@ -0,0 +1,87 @@ +<!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>[245] fix syntax</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>245</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:46:15 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix syntax</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:44:42 UTC (rev 244) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:15 UTC (rev 245) +@@ -43,14 +43,14 @@ + } + } + class allow_dns_in { +- rule_line { "ACCEPT net fw tcp 53" } +- rule_line { "ACCEPT net fw udp 53" } ++ rule_line { "ACCEPT net fw tcp 53": } ++ rule_line { "ACCEPT net fw udp 53": } + } + class allow_smtp_in { +- rule_line { "ACCEPT net fw tcp 25" } ++ rule_line { "ACCEPT net fw tcp 25": } + } + class allow_www_in { +- rule_line { "ACCEPT net fw tcp 80" } ++ rule_line { "ACCEPT net fw tcp 80": } + } + + ### Zones + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/9705c3c6/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/9705c3c6/attachment.html new file mode 100644 index 000000000..71daa37a9 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/9705c3c6/attachment.html @@ -0,0 +1,87 @@ +<!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>[245] fix syntax</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>245</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:46:15 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix syntax</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:44:42 UTC (rev 244) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:15 UTC (rev 245) +@@ -43,14 +43,14 @@ + } + } + class allow_dns_in { +- rule_line { "ACCEPT net fw tcp 53" } +- rule_line { "ACCEPT net fw udp 53" } ++ rule_line { "ACCEPT net fw tcp 53": } ++ rule_line { "ACCEPT net fw udp 53": } + } + class allow_smtp_in { +- rule_line { "ACCEPT net fw tcp 25" } ++ rule_line { "ACCEPT net fw tcp 25": } + } + class allow_www_in { +- rule_line { "ACCEPT net fw tcp 80" } ++ rule_line { "ACCEPT net fw tcp 80": } + } + + ### Zones + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/a7099c8b/attachment-0001.asc b/zarb-ml/mageia-sysadm/attachments/20101112/a7099c8b/attachment-0001.asc new file mode 100644 index 000000000..491c5b267 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/a7099c8b/attachment-0001.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAkzduhAACgkQk29cDOWzfVAbdACg98U+vyvXdHwrFxl3S+ZHa1Gl +m2gAnie0zKafwMtCMiN2RmvYy0c6Avr+ +=DGuv +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/a7099c8b/attachment.asc b/zarb-ml/mageia-sysadm/attachments/20101112/a7099c8b/attachment.asc new file mode 100644 index 000000000..491c5b267 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/a7099c8b/attachment.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAkzduhAACgkQk29cDOWzfVAbdACg98U+vyvXdHwrFxl3S+ZHa1Gl +m2gAnie0zKafwMtCMiN2RmvYy0c6Avr+ +=DGuv +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/b0723b5d/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/b0723b5d/attachment-0001.html new file mode 100644 index 000000000..84ddc117b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/b0723b5d/attachment-0001.html @@ -0,0 +1,279 @@ +<!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>[242] add shorewall module</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>242</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:38:24 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add shorewall module</pre> + +<h3>Added Paths</h3> +<ul> +<li>puppet/modules/shorewall/</li> +<li>puppet/modules/shorewall/files/</li> +<li>puppet/modules/shorewall/files/footers/</li> +<li><a href="#puppetmodulesshorewallfilesfootersinterfaces">puppet/modules/shorewall/files/footers/interfaces</a></li> +<li><a href="#puppetmodulesshorewallfilesfooterspolicy">puppet/modules/shorewall/files/footers/policy</a></li> +<li><a href="#puppetmodulesshorewallfilesfootersrules">puppet/modules/shorewall/files/footers/rules</a></li> +<li><a href="#puppetmodulesshorewallfilesfooterszones">puppet/modules/shorewall/files/footers/zones</a></li> +<li>puppet/modules/shorewall/files/headers/</li> +<li><a href="#puppetmodulesshorewallfilesheadersinterfaces">puppet/modules/shorewall/files/headers/interfaces</a></li> +<li><a href="#puppetmodulesshorewallfilesheaderspolicy">puppet/modules/shorewall/files/headers/policy</a></li> +<li><a href="#puppetmodulesshorewallfilesheadersrules">puppet/modules/shorewall/files/headers/rules</a></li> +<li><a href="#puppetmodulesshorewallfilesheaderszones">puppet/modules/shorewall/files/headers/zones</a></li> +<li>puppet/modules/shorewall/manifests/</li> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallfilesfootersinterfaces">Added: puppet/modules/shorewall/files/footers/interfaces</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/interfaces (rev 0) ++++ puppet/modules/shorewall/files/footers/interfaces 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesfooterspolicy">Added: puppet/modules/shorewall/files/footers/policy</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/policy (rev 0) ++++ puppet/modules/shorewall/files/footers/policy 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesfootersrules">Added: puppet/modules/shorewall/files/footers/rules</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/rules (rev 0) ++++ puppet/modules/shorewall/files/footers/rules 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesfooterszones">Added: puppet/modules/shorewall/files/footers/zones</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/zones (rev 0) ++++ puppet/modules/shorewall/files/footers/zones 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesheadersinterfaces">Added: puppet/modules/shorewall/files/headers/interfaces</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/interfaces (rev 0) ++++ puppet/modules/shorewall/files/headers/interfaces 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,10 @@ ++# ++# Shorewall version 4 - Interfaces File ++# ++# For information about entries in this file, type "man shorewall-interfaces" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-interfaces.html ++# ++############################################################################### ++#ZONE INTERFACE BROADCAST OPTIONS + +<a id="puppetmodulesshorewallfilesheaderspolicy">Added: puppet/modules/shorewall/files/headers/policy</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/policy (rev 0) ++++ puppet/modules/shorewall/files/headers/policy 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,11 @@ ++# ++# Shorewall version 4 - Policy File ++# ++# For information about entries in this file, type "man shorewall-policy" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-policy.html ++# ++############################################################################### ++#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: ++# LEVEL BURST MASK + +<a id="puppetmodulesshorewallfilesheadersrules">Added: puppet/modules/shorewall/files/headers/rules</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/rules (rev 0) ++++ puppet/modules/shorewall/files/headers/rules 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,11 @@ ++# ++# Shorewall version 4 - Rules File ++# ++# For information on the settings in this file, type "man shorewall-rules" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-rules.html ++# ++#################################################################################################################################################### ++#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME ++# PORT PORT(S) DEST LIMIT GROUP + +<a id="puppetmodulesshorewallfilesheaderszones">Added: puppet/modules/shorewall/files/headers/zones</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/zones (rev 0) ++++ puppet/modules/shorewall/files/headers/zones 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,11 @@ ++# ++# Shorewall version 4 - Zones File ++# ++# For information about this file, type "man shorewall-zones" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-zones.html ++# ++############################################################################### ++#ZONE TYPE OPTIONS IN OUT ++# OPTIONS OPTIONS + +<a id="puppetmodulesshorewallmanifestsinitpp">Added: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp (rev 0) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,102 @@ ++class shorewall { ++ include concat::setup ++ ++ define shorewallfile () { ++ $filename = "/etc/shorewall/${name}" ++ $header = "puppet:///modules/shorewall/headers/${name}" ++ $footer = "puppet:///modules/shorewall/footers/${name}" ++ concat{$filename: ++ owner => root, ++ group => root, ++ mode => 600, ++ } ++ ++ concat::fragment{"${name}_header": ++ target => $filename, ++ order => 1, ++ source => $header, ++ } ++ ++ concat::fragment{"${name}_footer": ++ target => $filename, ++ order => 99, ++ source => $footer, ++ } ++ } ++ ++ ### Rules ++ shorewallfile{ rules: } ++ define rule_line($order = 50) { ++ $filename = "/etc/shorewall/rules" ++ $line = $name ++ concat::fragment{"newline_${name}": ++ target => $filename, ++ order => $order, ++ content => $line, ++ } ++ } ++ class allow_ssh_in { ++ rule_line { "ACCEPT all all tcp 22": ++ order => 5, ++ } ++ } ++ class allow_dns_in { ++ rule_line { "ACCEPT net fw tcp 53" } ++ rule_line { "ACCEPT net fw udp 53" } ++ } ++ class allow_smtp_in { ++ rule_line { "ACCEPT net fw tcp 25" } ++ } ++ class allow_www_in { ++ rule_line { "ACCEPT net fw tcp 80" } ++ } ++ ++ ### Zones ++ shorewallfile{ zones: } ++ define zone_line($order = 50) { ++ $filename = "/etc/shorewall/zones" ++ $line = $name ++ concat::fragment{"newline_${name}": ++ target => $filename, ++ order => $order, ++ content => $line, ++ } ++ } ++ class default_zones { ++ zone_line { "net ipv4": ++ $order => 2, ++ } ++ zone_line { "fw firewall": ++ $order => 3, ++ } ++ } ++ ++ ### Policy ++ shorewallfile{ policy: } ++ define policy_line($order = 50) { ++ $filename = "/etc/shorewall/policy" ++ $line = $name ++ concat::fragment{"newline_${name}": ++ target => $filename, ++ order => $order, ++ content => $line, ++ } ++ } ++ class default_policy { ++ policy_line{ "fw net ACCEPT": ++ $order => 2, ++ } ++ policy_line{ "net all DROP info": ++ $order => 3, ++ } ++ policy_line{ "all all REJECT info": ++ $order => 4, ++ } ++ } ++ ++ class default_firewall() { ++ include default_zones ++ include default_policy ++ include allow_ssh_in ++ } ++} + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/b0723b5d/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/b0723b5d/attachment.html new file mode 100644 index 000000000..84ddc117b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/b0723b5d/attachment.html @@ -0,0 +1,279 @@ +<!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>[242] add shorewall module</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>242</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:38:24 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add shorewall module</pre> + +<h3>Added Paths</h3> +<ul> +<li>puppet/modules/shorewall/</li> +<li>puppet/modules/shorewall/files/</li> +<li>puppet/modules/shorewall/files/footers/</li> +<li><a href="#puppetmodulesshorewallfilesfootersinterfaces">puppet/modules/shorewall/files/footers/interfaces</a></li> +<li><a href="#puppetmodulesshorewallfilesfooterspolicy">puppet/modules/shorewall/files/footers/policy</a></li> +<li><a href="#puppetmodulesshorewallfilesfootersrules">puppet/modules/shorewall/files/footers/rules</a></li> +<li><a href="#puppetmodulesshorewallfilesfooterszones">puppet/modules/shorewall/files/footers/zones</a></li> +<li>puppet/modules/shorewall/files/headers/</li> +<li><a href="#puppetmodulesshorewallfilesheadersinterfaces">puppet/modules/shorewall/files/headers/interfaces</a></li> +<li><a href="#puppetmodulesshorewallfilesheaderspolicy">puppet/modules/shorewall/files/headers/policy</a></li> +<li><a href="#puppetmodulesshorewallfilesheadersrules">puppet/modules/shorewall/files/headers/rules</a></li> +<li><a href="#puppetmodulesshorewallfilesheaderszones">puppet/modules/shorewall/files/headers/zones</a></li> +<li>puppet/modules/shorewall/manifests/</li> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallfilesfootersinterfaces">Added: puppet/modules/shorewall/files/footers/interfaces</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/interfaces (rev 0) ++++ puppet/modules/shorewall/files/footers/interfaces 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesfooterspolicy">Added: puppet/modules/shorewall/files/footers/policy</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/policy (rev 0) ++++ puppet/modules/shorewall/files/footers/policy 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesfootersrules">Added: puppet/modules/shorewall/files/footers/rules</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/rules (rev 0) ++++ puppet/modules/shorewall/files/footers/rules 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesfooterszones">Added: puppet/modules/shorewall/files/footers/zones</a> +=================================================================== +--- puppet/modules/shorewall/files/footers/zones (rev 0) ++++ puppet/modules/shorewall/files/footers/zones 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1 @@ ++#LAST LINE -- DO NOT REMOVE + +<a id="puppetmodulesshorewallfilesheadersinterfaces">Added: puppet/modules/shorewall/files/headers/interfaces</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/interfaces (rev 0) ++++ puppet/modules/shorewall/files/headers/interfaces 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,10 @@ ++# ++# Shorewall version 4 - Interfaces File ++# ++# For information about entries in this file, type "man shorewall-interfaces" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-interfaces.html ++# ++############################################################################### ++#ZONE INTERFACE BROADCAST OPTIONS + +<a id="puppetmodulesshorewallfilesheaderspolicy">Added: puppet/modules/shorewall/files/headers/policy</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/policy (rev 0) ++++ puppet/modules/shorewall/files/headers/policy 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,11 @@ ++# ++# Shorewall version 4 - Policy File ++# ++# For information about entries in this file, type "man shorewall-policy" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-policy.html ++# ++############################################################################### ++#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: ++# LEVEL BURST MASK + +<a id="puppetmodulesshorewallfilesheadersrules">Added: puppet/modules/shorewall/files/headers/rules</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/rules (rev 0) ++++ puppet/modules/shorewall/files/headers/rules 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,11 @@ ++# ++# Shorewall version 4 - Rules File ++# ++# For information on the settings in this file, type "man shorewall-rules" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-rules.html ++# ++#################################################################################################################################################### ++#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME ++# PORT PORT(S) DEST LIMIT GROUP + +<a id="puppetmodulesshorewallfilesheaderszones">Added: puppet/modules/shorewall/files/headers/zones</a> +=================================================================== +--- puppet/modules/shorewall/files/headers/zones (rev 0) ++++ puppet/modules/shorewall/files/headers/zones 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,11 @@ ++# ++# Shorewall version 4 - Zones File ++# ++# For information about this file, type "man shorewall-zones" ++# ++# The manpage is also online at ++# http://www.shorewall.net/manpages/shorewall-zones.html ++# ++############################################################################### ++#ZONE TYPE OPTIONS IN OUT ++# OPTIONS OPTIONS + +<a id="puppetmodulesshorewallmanifestsinitpp">Added: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp (rev 0) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:38:24 UTC (rev 242) +@@ -0,0 +1,102 @@ ++class shorewall { ++ include concat::setup ++ ++ define shorewallfile () { ++ $filename = "/etc/shorewall/${name}" ++ $header = "puppet:///modules/shorewall/headers/${name}" ++ $footer = "puppet:///modules/shorewall/footers/${name}" ++ concat{$filename: ++ owner => root, ++ group => root, ++ mode => 600, ++ } ++ ++ concat::fragment{"${name}_header": ++ target => $filename, ++ order => 1, ++ source => $header, ++ } ++ ++ concat::fragment{"${name}_footer": ++ target => $filename, ++ order => 99, ++ source => $footer, ++ } ++ } ++ ++ ### Rules ++ shorewallfile{ rules: } ++ define rule_line($order = 50) { ++ $filename = "/etc/shorewall/rules" ++ $line = $name ++ concat::fragment{"newline_${name}": ++ target => $filename, ++ order => $order, ++ content => $line, ++ } ++ } ++ class allow_ssh_in { ++ rule_line { "ACCEPT all all tcp 22": ++ order => 5, ++ } ++ } ++ class allow_dns_in { ++ rule_line { "ACCEPT net fw tcp 53" } ++ rule_line { "ACCEPT net fw udp 53" } ++ } ++ class allow_smtp_in { ++ rule_line { "ACCEPT net fw tcp 25" } ++ } ++ class allow_www_in { ++ rule_line { "ACCEPT net fw tcp 80" } ++ } ++ ++ ### Zones ++ shorewallfile{ zones: } ++ define zone_line($order = 50) { ++ $filename = "/etc/shorewall/zones" ++ $line = $name ++ concat::fragment{"newline_${name}": ++ target => $filename, ++ order => $order, ++ content => $line, ++ } ++ } ++ class default_zones { ++ zone_line { "net ipv4": ++ $order => 2, ++ } ++ zone_line { "fw firewall": ++ $order => 3, ++ } ++ } ++ ++ ### Policy ++ shorewallfile{ policy: } ++ define policy_line($order = 50) { ++ $filename = "/etc/shorewall/policy" ++ $line = $name ++ concat::fragment{"newline_${name}": ++ target => $filename, ++ order => $order, ++ content => $line, ++ } ++ } ++ class default_policy { ++ policy_line{ "fw net ACCEPT": ++ $order => 2, ++ } ++ policy_line{ "net all DROP info": ++ $order => 3, ++ } ++ policy_line{ "all all REJECT info": ++ $order => 4, ++ } ++ } ++ ++ class default_firewall() { ++ include default_zones ++ include default_policy ++ include allow_ssh_in ++ } ++} + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/b0caf7cf/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/b0caf7cf/attachment-0001.html new file mode 100644 index 000000000..158eb1ccf --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/b0caf7cf/attachment-0001.html @@ -0,0 +1,107 @@ +<!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>[243] save shorewall config in /etc/shorewall_test for testing</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>243</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:43:03 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>save shorewall config in /etc/shorewall_test for testing</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:38:24 UTC (rev 242) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:43:03 UTC (rev 243) +@@ -1,8 +1,10 @@ + class shorewall { + include concat::setup + ++ $shorewalldir = "/etc/shorewall_test" ++ + define shorewallfile () { +- $filename = "/etc/shorewall/${name}" ++ $filename = "${shorewalldir}/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -27,7 +29,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "/etc/shorewall/rules" ++ $filename = "${shorewalldir}/shorewall/rules" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -54,7 +56,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "/etc/shorewall/zones" ++ $filename = "${shorewalldir}/shorewall/zones" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -74,7 +76,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "/etc/shorewall/policy" ++ $filename = "${shorewalldir}/shorewall/policy" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/b0caf7cf/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/b0caf7cf/attachment.html new file mode 100644 index 000000000..158eb1ccf --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/b0caf7cf/attachment.html @@ -0,0 +1,107 @@ +<!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>[243] save shorewall config in /etc/shorewall_test for testing</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>243</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:43:03 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>save shorewall config in /etc/shorewall_test for testing</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:38:24 UTC (rev 242) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:43:03 UTC (rev 243) +@@ -1,8 +1,10 @@ + class shorewall { + include concat::setup + ++ $shorewalldir = "/etc/shorewall_test" ++ + define shorewallfile () { +- $filename = "/etc/shorewall/${name}" ++ $filename = "${shorewalldir}/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -27,7 +29,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "/etc/shorewall/rules" ++ $filename = "${shorewalldir}/shorewall/rules" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -54,7 +56,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "/etc/shorewall/zones" ++ $filename = "${shorewalldir}/shorewall/zones" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -74,7 +76,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "/etc/shorewall/policy" ++ $filename = "${shorewalldir}/shorewall/policy" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/bd4adb21/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/bd4adb21/attachment-0001.html new file mode 100644 index 000000000..f49f1a1ac --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/bd4adb21/attachment-0001.html @@ -0,0 +1,76 @@ +<!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>[244] enable shorewall module on jonund</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>244</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:44:42 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>enable shorewall module on jonund</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2010-11-12 20:43:03 UTC (rev 243) ++++ puppet/manifests/nodes.pp 2010-11-12 20:44:42 UTC (rev 244) +@@ -62,6 +62,7 @@ + include default_mageia_server + #include buildsystem::buildnode + timezone::timezone { "Europe/Paris": } ++ include shorewall::default_firewall + } + + node ecosse { + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/bd4adb21/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/bd4adb21/attachment.html new file mode 100644 index 000000000..f49f1a1ac --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/bd4adb21/attachment.html @@ -0,0 +1,76 @@ +<!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>[244] enable shorewall module on jonund</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>244</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:44:42 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>enable shorewall module on jonund</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2010-11-12 20:43:03 UTC (rev 243) ++++ puppet/manifests/nodes.pp 2010-11-12 20:44:42 UTC (rev 244) +@@ -62,6 +62,7 @@ + include default_mageia_server + #include buildsystem::buildnode + timezone::timezone { "Europe/Paris": } ++ include shorewall::default_firewall + } + + node ecosse { + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/c7579815/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/c7579815/attachment-0001.html new file mode 100644 index 000000000..d48a9d7f3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/c7579815/attachment-0001.html @@ -0,0 +1,625 @@ +<!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>[241] Add a module to construct files from fragments.</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>241</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 18:42:22 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Add a module to construct files from fragments. + +Downloaded from https://github.com/ripienaar/puppet-concat/</pre> + +<h3>Added Paths</h3> +<ul> +<li>puppet/modules/concat/</li> +<li><a href="#puppetmodulesconcatCHANGELOG">puppet/modules/concat/CHANGELOG</a></li> +<li><a href="#puppetmodulesconcatREADMEmarkdown">puppet/modules/concat/README.markdown</a></li> +<li>puppet/modules/concat/files/</li> +<li><a href="#puppetmodulesconcatfilesconcatfragmentssh">puppet/modules/concat/files/concatfragments.sh</a></li> +<li>puppet/modules/concat/files/null/</li> +<li><a href="#puppetmodulesconcatfilesnullgitignore">puppet/modules/concat/files/null/.gitignore</a></li> +<li>puppet/modules/concat/manifests/</li> +<li><a href="#puppetmodulesconcatmanifestsfragmentpp">puppet/modules/concat/manifests/fragment.pp</a></li> +<li><a href="#puppetmodulesconcatmanifestsinitpp">puppet/modules/concat/manifests/init.pp</a></li> +<li><a href="#puppetmodulesconcatmanifestssetuppp">puppet/modules/concat/manifests/setup.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesconcatCHANGELOG">Added: puppet/modules/concat/CHANGELOG</a> +=================================================================== +--- puppet/modules/concat/CHANGELOG (rev 0) ++++ puppet/modules/concat/CHANGELOG 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,27 @@ ++KNOWN ISSUES: ++- In 0.24.8 you will see inintended notifies, if you build a file ++ in a run, the next run will also see it as changed. This is due ++ to how 0.24.8 does the purging of unhandled files, this is improved ++ in 0.25.x and we cannot work around it in our code. ++ ++CHANGELOG: ++- 2010/02/19 - initial release ++- 2010/03/12 - add support for 0.24.8 and newer ++ - make the location of sort configurable ++ - add the ability to add shell comment based warnings to ++ top of files ++ - add the ablity to create empty files ++- 2010/04/05 - fix parsing of WARN and change code style to match rest ++ of the code ++ - Better and safer boolean handling for warn and force ++ - Don't use hard coded paths in the shell script, set PATH ++ top of the script ++ - Use file{} to copy the result and make all fragments owned ++ by root. This means we can chnage the ownership/group of the ++ resulting file at any time. ++ - You can specify ensure => "/some/other/file" in concat::fragment ++ to include the contents of a symlink into the final file. ++- 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name ++- 2010/05/22 - Improve documentation and show the use of ensure => ++- 2010/07/14 - Add support for setting the filebucket behavior of files ++- 2010/10/04 - Make the warning message configurable + +<a id="puppetmodulesconcatREADMEmarkdown">Added: puppet/modules/concat/README.markdown</a> +=================================================================== +--- puppet/modules/concat/README.markdown (rev 0) ++++ puppet/modules/concat/README.markdown 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,103 @@ ++What is it? ++=========== ++ ++A Puppet module that can construct files from fragments. ++ ++Please see the comments in the various .pp files for details ++as well as posts on my blog at http://www.devco.net/ ++ ++Released under the Apache 2.0 licence ++ ++Usage: ++------ ++ ++If you wanted a /etc/motd file that listed all the major modules ++on the machine. And that would be maintained automatically even ++if you just remove the include lines for other modules you could ++use code like below, a sample /etc/motd would be: ++ ++<pre> ++Puppet modules on this server: ++ ++ -- Apache ++ -- MySQL ++</pre> ++ ++Local sysadmins can also append to the file by just editing /etc/motd.local ++their changes will be incorporated into the puppet managed motd. ++ ++<pre> ++# class to setup basic motd, include on all nodes ++class motd { ++ include concat::setup ++ $motd = "/etc/motd" ++ ++ concat{$motd, ++ owner => root, ++ group => root, ++ mode => 644 ++ } ++ ++ concat::fragment{"motd_header": ++ target => $motd, ++ content => "\nPuppet modules on this server:\n\n", ++ order => 01, ++ } ++ ++ # local users on the machine can append to motd by just creating ++ # /etc/motd.local ++ concat::fragment{"motd_local": ++ target => $motd, ++ ensure => "/etc/motd.local", ++ order => 15 ++ } ++} ++ ++# used by other modules to register themselves in the motd ++define motd::register($content="", $order=10) { ++ if $content == "" { ++ $body = $name ++ } else { ++ $body = $content ++ } ++ ++ concat::fragment{"motd_fragment_$name": ++ target => "/etc/motd", ++ content => " -- $body\n" ++ } ++} ++ ++# a sample apache module ++class apache { ++ include apache::install, apache::config, apache::service ++ ++ motd::register{"Apache": } ++} ++</pre> ++ ++Known Issues: ++------------- ++* In 0.24.8 you will see inintended notifies, if you build a file ++ in a run, the next run will also see it as changed. This is due ++ to how 0.24.8 does the purging of unhandled files, this is improved ++ in 0.25.x and we cannot work around it in our code. ++ ++Contributors: ++------------- ++**Paul Elliot** ++ ++ * Provided 0.24.8 support, shell warnings and empty file creation support. ++ ++**Chad Netzer** ++ ++ * Various patches to improve safety of file operations ++ * Symlink support ++ ++**David Schmitt** ++ ++ * Patch to remove hard coded paths relying on OS path ++ * Patch to use file{} to copy the resulting file to the final destination. This means Puppet client will show diffs and that hopefully we can change file ownerships now ++ ++Contact: ++-------- ++You can contact me on rip@devco.net or follow my blog at http://www.devco.net I am also on twitter as ripienaar + +<a id="puppetmodulesconcatfilesconcatfragmentssh">Added: puppet/modules/concat/files/concatfragments.sh</a> +=================================================================== +--- puppet/modules/concat/files/concatfragments.sh (rev 0) ++++ puppet/modules/concat/files/concatfragments.sh 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,123 @@ ++#!/bin/bash ++ ++# Script to concat files to a config file. ++# ++# Given a directory like this: ++# /path/to/conf.d ++# |-- fragments ++# | |-- 00_named.conf ++# | |-- 10_domain.net ++# | `-- zz_footer ++# ++# The script supports a test option that will build the concat file to a temp location and ++# use /usr/bin/cmp to verify if it should be run or not. This would result in the concat happening ++# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds. ++# ++# Without the test option and the unless combo your services that depend on the final file would end up ++# restarting on each run, or in other manifest models some changes might get missed. ++# ++# OPTIONS: ++# -o The file to create from the sources ++# -d The directory where the fragments are kept ++# -t Test to find out if a build is needed, basically concats the files to a temp ++# location and compare with what's in the final location, return codes are designed ++# for use with unless on an exec resource ++# -w Add a shell style comment at the top of the created file to warn users that it ++# is generated by puppet ++# -f Enables the creation of empty output files when no fragments are found ++# -n Sort the output numerically rather than the default alpha sort ++# ++# the command: ++# ++# concatfragments.sh -o /path/to/conffile.cfg -d /path/to/conf.d ++# ++# creates /path/to/conf.d/fragments.concat and copies the resulting ++# file to /path/to/conffile.cfg. The files will be sorted alphabetically ++# pass the -n switch to sort numerically. ++# ++# The script does error checking on the various dirs and files to make ++# sure things don't fail. ++ ++OUTFILE="" ++WORKDIR="" ++TEST="" ++FORCE="" ++WARN="" ++SORTARG="-z" ++ ++PATH=/sbin:/usr/sbin:/bin:/usr/bin ++ ++while getopts "o:s:d:tnw:f" options; do ++ case $options in ++ o ) OUTFILE=$OPTARG;; ++ d ) WORKDIR=$OPTARG;; ++ n ) SORTARG="-zn";; ++ w ) WARNMSG="$OPTARG";; ++ f ) FORCE="true";; ++ t ) TEST="true";; ++ * ) echo "Specify output file with -o and fragments directory with -d" ++ exit 1;; ++ esac ++done ++ ++# do we have -o? ++if [ x${OUTFILE} = "x" ]; then ++ echo "Please specify an output file with -o" ++ exit 1 ++fi ++ ++# do we have -d? ++if [ x${WORKDIR} = "x" ]; then ++ echo "Please fragments directory with -d" ++ exit 1 ++fi ++ ++# can we write to -o? ++if [ -a ${OUTFILE} ]; then ++ if [ ! -w ${OUTFILE} ]; then ++ echo "Cannot write to ${OUTFILE}" ++ exit 1 ++ fi ++else ++ if [ ! -w `dirname ${OUTFILE}` ]; then ++ echo "Cannot write to `dirname ${OUTFILE}` to create ${OUTFILE}" ++ exit 1 ++ fi ++fi ++ ++# do we have a fragments subdir inside the work dir? ++if [ ! -d "${WORKDIR}/fragments" ] && [ ! -x "${WORKDIR}/fragments" ]; then ++ echo "Cannot access the fragments directory" ++ exit 1 ++fi ++ ++# are there actually any fragments? ++if [ ! "$(ls -A ${WORKDIR}/fragments)" ]; then ++ if [ x${FORCE} = "x" ]; then ++ echo "The fragments directory is empty, cowardly refusing to make empty config files" ++ exit 1 ++ fi ++fi ++ ++cd ${WORKDIR} ++ ++if [ x${WARNMSG} = "x" ]; then ++ : > "fragments.concat" ++else ++ echo -e "$WARNMSG" > "fragments.concat" ++fi ++ ++# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir ++find fragments/ -type f -follow -print0 |sort ${SORTARG}|xargs -0 cat >>"fragments.concat" ++ ++if [ x${TEST} = "x" ]; then ++ # This is a real run, copy the file to outfile ++ cp fragments.concat ${OUTFILE} ++ RETVAL=$? ++else ++ # Just compare the result to outfile to help the exec decide ++ cmp ${OUTFILE} fragments.concat ++ RETVAL=$? ++fi ++ ++exit $RETVAL + + +Property changes on: puppet/modules/concat/files/concatfragments.sh +___________________________________________________________________ +<a id="svnexecutable">Added: svn:executable</a> + + * +<a id="svneolstyle">Added: svn:eol-style</a> + + native + +<a id="puppetmodulesconcatfilesnullgitignore">Added: puppet/modules/concat/files/null/.gitignore</a> +=================================================================== +<a id="puppetmodulesconcatmanifestsfragmentpp">Added: puppet/modules/concat/manifests/fragment.pp</a> +=================================================================== +--- puppet/modules/concat/manifests/fragment.pp (rev 0) ++++ puppet/modules/concat/manifests/fragment.pp 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,51 @@ ++# Puts a file fragment into a directory previous setup using concat ++# ++# OPTIONS: ++# - target The file that these fragments belong to ++# - content If present puts the content into the file ++# - source If content was not specified, use the source ++# - order By default all files gets a 10_ prefix in the directory ++# you can set it to anything else using this to influence the ++# order of the content in the file ++# - ensure Present/Absent or destination to a file to include another file ++# - mode Mode for the file ++# - owner Owner of the file ++# - group Owner of the file ++# - backup Controls the filebucketing behavior of the final file and ++# see File type reference for its use. Defaults to 'puppet' ++define concat::fragment($target, $content='', $source='', $order=10, $ensure = "present", $mode = 0644, $owner = root, $group = root, $backup = "puppet") { ++ $safe_name = regsubst($name, '/', '_', 'G') ++ $safe_target_name = regsubst($target, '/', '_', 'G') ++ $concatdir = $concat::setup::concatdir ++ $fragdir = "${concatdir}/${safe_target_name}" ++ ++ # if content is passed, use that, else if source is passed use that ++ # if neither passed, but $ensure is in symlink form, make a symlink ++ case $content { ++ "": { ++ case $source { ++ "": { ++ case $ensure { ++ "", "absent", "present", "file", "directory": { ++ crit("No content, source or symlink specified") ++ } ++ } ++ } ++ default: { File{ source => $source } } ++ } ++ } ++ default: { File{ content => $content } } ++ } ++ ++ file{"${fragdir}/fragments/${order}_${safe_name}": ++ mode => $mode, ++ owner => $owner, ++ group => $group, ++ ensure => $ensure, ++ backup => $backup, ++ alias => "concat_fragment_${name}", ++ notify => Exec["concat_${target}"] ++ } ++} ++ ++# vi:tabstop=4:expandtab:ai + +<a id="puppetmodulesconcatmanifestsinitpp">Added: puppet/modules/concat/manifests/init.pp</a> +=================================================================== +--- puppet/modules/concat/manifests/init.pp (rev 0) ++++ puppet/modules/concat/manifests/init.pp 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,164 @@ ++# A system to construct files using fragments from other files or templates. ++# ++# This requires at least puppet 0.25 to work correctly as we use some ++# enhancements in recursive directory management and regular expressions ++# to do the work here. ++# ++# USAGE: ++# The basic use case is as below: ++# ++# concat{"/etc/named.conf": ++# notify => Service["named"] ++# } ++# ++# concat::fragment{"foo.com_config": ++# target => "/etc/named.conf", ++# order => 10, ++# content => template("named_conf_zone.erb") ++# } ++# ++# # add a fragment not managed by puppet so local users ++# # can add content to managed file ++# concat::fragment{"foo.com_user_config": ++# target => "/etc/named.conf", ++# order => 12, ++# ensure => "/etc/named.conf.local" ++# } ++# ++# This will use the template named_conf_zone.erb to build a single ++# bit of config up and put it into the fragments dir. The file ++# will have an number prefix of 10, you can use the order option ++# to control that and thus control the order the final file gets built in. ++# ++# SETUP: ++# The class concat::setup defines a variable $concatdir - you should set this ++# to a directory where you want all the temporary files and fragments to be ++# stored. Avoid placing this somewhere like /tmp since you should never ++# delete files here, puppet will manage them. ++# ++# There's some regular expression magic to figure out the puppet version but ++# if you're on an older 0.24 version just set $puppetversion = 24 ++# ++# Before you can use any of the concat features you should include the ++# class concat::setup somewhere on your node first. ++# ++# DETAIL: ++# We use a helper shell script called concatfragments.sh that gets placed ++# in /usr/local/bin to do the concatenation. While this might seem more ++# complex than some of the one-liner alternatives you might find on the net ++# we do a lot of error checking and safety checks in the script to avoid ++# problems that might be caused by complex escaping errors etc. ++# ++# LICENSE: ++# Apache Version 2 ++# ++# LATEST: ++# http://github.com/ripienaar/puppet-concat/ ++# ++# CONTACT: ++# R.I.Pienaar <rip@devco.net> ++# Volcane on freenode ++# @ripienaar on twitter ++# www.devco.net ++ ++ ++# Sets up so that you can use fragments to build a final config file, ++# ++# OPTIONS: ++# - mode The mode of the final file ++# - owner Who will own the file ++# - group Who will own the file ++# - force Enables creating empty files if no fragments are present ++# - warn Adds a normal shell style comment top of the file indicating ++# that it is built by puppet ++# - backup Controls the filebucketing behavior of the final file and ++# see File type reference for its use. Defaults to 'puppet' ++# ++# ACTIONS: ++# - Creates fragment directories if it didn't exist already ++# - Executes the concatfragments.sh script to build the final file, this script will create ++# directory/fragments.concat. Execution happens only when: ++# * The directory changes ++# * fragments.concat != final destination, this means rebuilds will happen whenever ++# someone changes or deletes the final file. Checking is done using /usr/bin/cmp. ++# * The Exec gets notified by something else - like the concat::fragment define ++# - Copies the file over to the final destination using a file resource ++# ++# ALIASES: ++# - The exec can notified using Exec["concat_/path/to/file"] or Exec["concat_/path/to/directory"] ++# - The final file can be referened as File["/path/to/file"] or File["concat_/path/to/file"] ++define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $force = "false", $backup = "puppet") { ++ $safe_name = regsubst($name, '/', '_', 'G') ++ $concatdir = $concat::setup::concatdir ++ $version = $concat::setup::majorversion ++ $fragdir = "${concatdir}/${safe_name}" ++ $concat_name = "fragments.concat.out" ++ $default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.' ++ ++ case $warn { ++ 'true',true,yes,on: { $warnmsg = "$default_warn_message" } ++ 'false',false,no,off: { $warnmsg = "" } ++ default: { $warnmsg = "$warn" } ++ } ++ ++ $warnmsg_escaped = regsubst($warnmsg, "'", "'\\\\''", 'G') ++ $warnflag = $warnmsg_escaped ? { ++ '' => '', ++ default => "-w '$warnmsg_escaped'" ++ } ++ ++ case $force { ++ 'true',true,yes,on: { $forceflag = "-f" } ++ 'false',false,no,off: { $forceflag = "" } ++ default: { fail("Improper 'force' value given to concat: $force") } ++ } ++ ++ File{ ++ owner => root, ++ group => root, ++ mode => $mode, ++ backup => $backup ++ } ++ ++ file{$fragdir: ++ ensure => directory; ++ ++ "${fragdir}/fragments": ++ ensure => directory, ++ recurse => true, ++ purge => true, ++ force => true, ++ ignore => [".svn", ".git", ".gitignore"], ++ source => $version ? { ++ 24 => "puppet:///concat/null", ++ default => undef, ++ }, ++ notify => Exec["concat_${name}"]; ++ ++ "${fragdir}/fragments.concat": ++ ensure => present; ++ ++ "${fragdir}/${concat_name}": ++ ensure => present; ++ ++ $name: ++ source => "${fragdir}/${concat_name}", ++ owner => $owner, ++ group => $group, ++ checksum => md5, ++ mode => $mode, ++ ensure => present, ++ alias => "concat_${name}"; ++ } ++ ++ exec{"concat_${name}": ++ user => root, ++ group => root, ++ notify => File[$name], ++ subscribe => File[$fragdir], ++ alias => "concat_${fragdir}", ++ require => [ File["/usr/local/bin/concatfragments.sh"], File[$fragdir], File["${fragdir}/fragments"], File["${fragdir}/fragments.concat"] ], ++ unless => "/usr/local/bin/concatfragments.sh -o ${fragdir}/${concat_name} -d ${fragdir} -t ${warnflag} ${forceflag}", ++ command => "/usr/local/bin/concatfragments.sh -o ${fragdir}/${concat_name} -d ${fragdir} ${warnflag} ${forceflag}", ++ } ++} + +<a id="puppetmodulesconcatmanifestssetuppp">Added: puppet/modules/concat/manifests/setup.pp</a> +=================================================================== +--- puppet/modules/concat/manifests/setup.pp (rev 0) ++++ puppet/modules/concat/manifests/setup.pp 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,36 @@ ++# Sets up the concat system. ++# ++# $concatdir should point to a place where you wish the fragments to ++# live. This should not be somewhere like /tmp since ideally these files ++# should not be deleted ever, puppet should always manage them ++# ++# $puppetversion should be either 24 or 25 to enable a 24 compatible ++# mode, in 24 mode you might see phantom notifies this is a side effect ++# of the method we use to clear the fragments directory. ++# ++# The regular expression below will try to figure out your puppet version ++# but this code will only work in 0.24.8 and newer. ++# ++# It also copies out the concatfragments.sh file to /usr/local/bin ++class concat::setup { ++ $concatdir = "/var/lib/puppet/concat" ++ $majorversion = regsubst($puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') ++ ++ file{"/usr/local/bin/concatfragments.sh": ++ owner => root, ++ group => root, ++ mode => 755, ++ source => $majorversion ? { ++ 24 => "puppet:///concat/concatfragments.sh", ++ default => "puppet:///modules/concat/concatfragments.sh" ++ }; ++ ++ $concatdir: ++ ensure => directory, ++ owner => root, ++ group => root, ++ mode => 755; ++ } ++} ++ ++# vi:tabstop=4:expandtab:ai + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/c7579815/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/c7579815/attachment.html new file mode 100644 index 000000000..d48a9d7f3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/c7579815/attachment.html @@ -0,0 +1,625 @@ +<!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>[241] Add a module to construct files from fragments.</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>241</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 18:42:22 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Add a module to construct files from fragments. + +Downloaded from https://github.com/ripienaar/puppet-concat/</pre> + +<h3>Added Paths</h3> +<ul> +<li>puppet/modules/concat/</li> +<li><a href="#puppetmodulesconcatCHANGELOG">puppet/modules/concat/CHANGELOG</a></li> +<li><a href="#puppetmodulesconcatREADMEmarkdown">puppet/modules/concat/README.markdown</a></li> +<li>puppet/modules/concat/files/</li> +<li><a href="#puppetmodulesconcatfilesconcatfragmentssh">puppet/modules/concat/files/concatfragments.sh</a></li> +<li>puppet/modules/concat/files/null/</li> +<li><a href="#puppetmodulesconcatfilesnullgitignore">puppet/modules/concat/files/null/.gitignore</a></li> +<li>puppet/modules/concat/manifests/</li> +<li><a href="#puppetmodulesconcatmanifestsfragmentpp">puppet/modules/concat/manifests/fragment.pp</a></li> +<li><a href="#puppetmodulesconcatmanifestsinitpp">puppet/modules/concat/manifests/init.pp</a></li> +<li><a href="#puppetmodulesconcatmanifestssetuppp">puppet/modules/concat/manifests/setup.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesconcatCHANGELOG">Added: puppet/modules/concat/CHANGELOG</a> +=================================================================== +--- puppet/modules/concat/CHANGELOG (rev 0) ++++ puppet/modules/concat/CHANGELOG 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,27 @@ ++KNOWN ISSUES: ++- In 0.24.8 you will see inintended notifies, if you build a file ++ in a run, the next run will also see it as changed. This is due ++ to how 0.24.8 does the purging of unhandled files, this is improved ++ in 0.25.x and we cannot work around it in our code. ++ ++CHANGELOG: ++- 2010/02/19 - initial release ++- 2010/03/12 - add support for 0.24.8 and newer ++ - make the location of sort configurable ++ - add the ability to add shell comment based warnings to ++ top of files ++ - add the ablity to create empty files ++- 2010/04/05 - fix parsing of WARN and change code style to match rest ++ of the code ++ - Better and safer boolean handling for warn and force ++ - Don't use hard coded paths in the shell script, set PATH ++ top of the script ++ - Use file{} to copy the result and make all fragments owned ++ by root. This means we can chnage the ownership/group of the ++ resulting file at any time. ++ - You can specify ensure => "/some/other/file" in concat::fragment ++ to include the contents of a symlink into the final file. ++- 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name ++- 2010/05/22 - Improve documentation and show the use of ensure => ++- 2010/07/14 - Add support for setting the filebucket behavior of files ++- 2010/10/04 - Make the warning message configurable + +<a id="puppetmodulesconcatREADMEmarkdown">Added: puppet/modules/concat/README.markdown</a> +=================================================================== +--- puppet/modules/concat/README.markdown (rev 0) ++++ puppet/modules/concat/README.markdown 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,103 @@ ++What is it? ++=========== ++ ++A Puppet module that can construct files from fragments. ++ ++Please see the comments in the various .pp files for details ++as well as posts on my blog at http://www.devco.net/ ++ ++Released under the Apache 2.0 licence ++ ++Usage: ++------ ++ ++If you wanted a /etc/motd file that listed all the major modules ++on the machine. And that would be maintained automatically even ++if you just remove the include lines for other modules you could ++use code like below, a sample /etc/motd would be: ++ ++<pre> ++Puppet modules on this server: ++ ++ -- Apache ++ -- MySQL ++</pre> ++ ++Local sysadmins can also append to the file by just editing /etc/motd.local ++their changes will be incorporated into the puppet managed motd. ++ ++<pre> ++# class to setup basic motd, include on all nodes ++class motd { ++ include concat::setup ++ $motd = "/etc/motd" ++ ++ concat{$motd, ++ owner => root, ++ group => root, ++ mode => 644 ++ } ++ ++ concat::fragment{"motd_header": ++ target => $motd, ++ content => "\nPuppet modules on this server:\n\n", ++ order => 01, ++ } ++ ++ # local users on the machine can append to motd by just creating ++ # /etc/motd.local ++ concat::fragment{"motd_local": ++ target => $motd, ++ ensure => "/etc/motd.local", ++ order => 15 ++ } ++} ++ ++# used by other modules to register themselves in the motd ++define motd::register($content="", $order=10) { ++ if $content == "" { ++ $body = $name ++ } else { ++ $body = $content ++ } ++ ++ concat::fragment{"motd_fragment_$name": ++ target => "/etc/motd", ++ content => " -- $body\n" ++ } ++} ++ ++# a sample apache module ++class apache { ++ include apache::install, apache::config, apache::service ++ ++ motd::register{"Apache": } ++} ++</pre> ++ ++Known Issues: ++------------- ++* In 0.24.8 you will see inintended notifies, if you build a file ++ in a run, the next run will also see it as changed. This is due ++ to how 0.24.8 does the purging of unhandled files, this is improved ++ in 0.25.x and we cannot work around it in our code. ++ ++Contributors: ++------------- ++**Paul Elliot** ++ ++ * Provided 0.24.8 support, shell warnings and empty file creation support. ++ ++**Chad Netzer** ++ ++ * Various patches to improve safety of file operations ++ * Symlink support ++ ++**David Schmitt** ++ ++ * Patch to remove hard coded paths relying on OS path ++ * Patch to use file{} to copy the resulting file to the final destination. This means Puppet client will show diffs and that hopefully we can change file ownerships now ++ ++Contact: ++-------- ++You can contact me on rip@devco.net or follow my blog at http://www.devco.net I am also on twitter as ripienaar + +<a id="puppetmodulesconcatfilesconcatfragmentssh">Added: puppet/modules/concat/files/concatfragments.sh</a> +=================================================================== +--- puppet/modules/concat/files/concatfragments.sh (rev 0) ++++ puppet/modules/concat/files/concatfragments.sh 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,123 @@ ++#!/bin/bash ++ ++# Script to concat files to a config file. ++# ++# Given a directory like this: ++# /path/to/conf.d ++# |-- fragments ++# | |-- 00_named.conf ++# | |-- 10_domain.net ++# | `-- zz_footer ++# ++# The script supports a test option that will build the concat file to a temp location and ++# use /usr/bin/cmp to verify if it should be run or not. This would result in the concat happening ++# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds. ++# ++# Without the test option and the unless combo your services that depend on the final file would end up ++# restarting on each run, or in other manifest models some changes might get missed. ++# ++# OPTIONS: ++# -o The file to create from the sources ++# -d The directory where the fragments are kept ++# -t Test to find out if a build is needed, basically concats the files to a temp ++# location and compare with what's in the final location, return codes are designed ++# for use with unless on an exec resource ++# -w Add a shell style comment at the top of the created file to warn users that it ++# is generated by puppet ++# -f Enables the creation of empty output files when no fragments are found ++# -n Sort the output numerically rather than the default alpha sort ++# ++# the command: ++# ++# concatfragments.sh -o /path/to/conffile.cfg -d /path/to/conf.d ++# ++# creates /path/to/conf.d/fragments.concat and copies the resulting ++# file to /path/to/conffile.cfg. The files will be sorted alphabetically ++# pass the -n switch to sort numerically. ++# ++# The script does error checking on the various dirs and files to make ++# sure things don't fail. ++ ++OUTFILE="" ++WORKDIR="" ++TEST="" ++FORCE="" ++WARN="" ++SORTARG="-z" ++ ++PATH=/sbin:/usr/sbin:/bin:/usr/bin ++ ++while getopts "o:s:d:tnw:f" options; do ++ case $options in ++ o ) OUTFILE=$OPTARG;; ++ d ) WORKDIR=$OPTARG;; ++ n ) SORTARG="-zn";; ++ w ) WARNMSG="$OPTARG";; ++ f ) FORCE="true";; ++ t ) TEST="true";; ++ * ) echo "Specify output file with -o and fragments directory with -d" ++ exit 1;; ++ esac ++done ++ ++# do we have -o? ++if [ x${OUTFILE} = "x" ]; then ++ echo "Please specify an output file with -o" ++ exit 1 ++fi ++ ++# do we have -d? ++if [ x${WORKDIR} = "x" ]; then ++ echo "Please fragments directory with -d" ++ exit 1 ++fi ++ ++# can we write to -o? ++if [ -a ${OUTFILE} ]; then ++ if [ ! -w ${OUTFILE} ]; then ++ echo "Cannot write to ${OUTFILE}" ++ exit 1 ++ fi ++else ++ if [ ! -w `dirname ${OUTFILE}` ]; then ++ echo "Cannot write to `dirname ${OUTFILE}` to create ${OUTFILE}" ++ exit 1 ++ fi ++fi ++ ++# do we have a fragments subdir inside the work dir? ++if [ ! -d "${WORKDIR}/fragments" ] && [ ! -x "${WORKDIR}/fragments" ]; then ++ echo "Cannot access the fragments directory" ++ exit 1 ++fi ++ ++# are there actually any fragments? ++if [ ! "$(ls -A ${WORKDIR}/fragments)" ]; then ++ if [ x${FORCE} = "x" ]; then ++ echo "The fragments directory is empty, cowardly refusing to make empty config files" ++ exit 1 ++ fi ++fi ++ ++cd ${WORKDIR} ++ ++if [ x${WARNMSG} = "x" ]; then ++ : > "fragments.concat" ++else ++ echo -e "$WARNMSG" > "fragments.concat" ++fi ++ ++# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir ++find fragments/ -type f -follow -print0 |sort ${SORTARG}|xargs -0 cat >>"fragments.concat" ++ ++if [ x${TEST} = "x" ]; then ++ # This is a real run, copy the file to outfile ++ cp fragments.concat ${OUTFILE} ++ RETVAL=$? ++else ++ # Just compare the result to outfile to help the exec decide ++ cmp ${OUTFILE} fragments.concat ++ RETVAL=$? ++fi ++ ++exit $RETVAL + + +Property changes on: puppet/modules/concat/files/concatfragments.sh +___________________________________________________________________ +<a id="svnexecutable">Added: svn:executable</a> + + * +<a id="svneolstyle">Added: svn:eol-style</a> + + native + +<a id="puppetmodulesconcatfilesnullgitignore">Added: puppet/modules/concat/files/null/.gitignore</a> +=================================================================== +<a id="puppetmodulesconcatmanifestsfragmentpp">Added: puppet/modules/concat/manifests/fragment.pp</a> +=================================================================== +--- puppet/modules/concat/manifests/fragment.pp (rev 0) ++++ puppet/modules/concat/manifests/fragment.pp 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,51 @@ ++# Puts a file fragment into a directory previous setup using concat ++# ++# OPTIONS: ++# - target The file that these fragments belong to ++# - content If present puts the content into the file ++# - source If content was not specified, use the source ++# - order By default all files gets a 10_ prefix in the directory ++# you can set it to anything else using this to influence the ++# order of the content in the file ++# - ensure Present/Absent or destination to a file to include another file ++# - mode Mode for the file ++# - owner Owner of the file ++# - group Owner of the file ++# - backup Controls the filebucketing behavior of the final file and ++# see File type reference for its use. Defaults to 'puppet' ++define concat::fragment($target, $content='', $source='', $order=10, $ensure = "present", $mode = 0644, $owner = root, $group = root, $backup = "puppet") { ++ $safe_name = regsubst($name, '/', '_', 'G') ++ $safe_target_name = regsubst($target, '/', '_', 'G') ++ $concatdir = $concat::setup::concatdir ++ $fragdir = "${concatdir}/${safe_target_name}" ++ ++ # if content is passed, use that, else if source is passed use that ++ # if neither passed, but $ensure is in symlink form, make a symlink ++ case $content { ++ "": { ++ case $source { ++ "": { ++ case $ensure { ++ "", "absent", "present", "file", "directory": { ++ crit("No content, source or symlink specified") ++ } ++ } ++ } ++ default: { File{ source => $source } } ++ } ++ } ++ default: { File{ content => $content } } ++ } ++ ++ file{"${fragdir}/fragments/${order}_${safe_name}": ++ mode => $mode, ++ owner => $owner, ++ group => $group, ++ ensure => $ensure, ++ backup => $backup, ++ alias => "concat_fragment_${name}", ++ notify => Exec["concat_${target}"] ++ } ++} ++ ++# vi:tabstop=4:expandtab:ai + +<a id="puppetmodulesconcatmanifestsinitpp">Added: puppet/modules/concat/manifests/init.pp</a> +=================================================================== +--- puppet/modules/concat/manifests/init.pp (rev 0) ++++ puppet/modules/concat/manifests/init.pp 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,164 @@ ++# A system to construct files using fragments from other files or templates. ++# ++# This requires at least puppet 0.25 to work correctly as we use some ++# enhancements in recursive directory management and regular expressions ++# to do the work here. ++# ++# USAGE: ++# The basic use case is as below: ++# ++# concat{"/etc/named.conf": ++# notify => Service["named"] ++# } ++# ++# concat::fragment{"foo.com_config": ++# target => "/etc/named.conf", ++# order => 10, ++# content => template("named_conf_zone.erb") ++# } ++# ++# # add a fragment not managed by puppet so local users ++# # can add content to managed file ++# concat::fragment{"foo.com_user_config": ++# target => "/etc/named.conf", ++# order => 12, ++# ensure => "/etc/named.conf.local" ++# } ++# ++# This will use the template named_conf_zone.erb to build a single ++# bit of config up and put it into the fragments dir. The file ++# will have an number prefix of 10, you can use the order option ++# to control that and thus control the order the final file gets built in. ++# ++# SETUP: ++# The class concat::setup defines a variable $concatdir - you should set this ++# to a directory where you want all the temporary files and fragments to be ++# stored. Avoid placing this somewhere like /tmp since you should never ++# delete files here, puppet will manage them. ++# ++# There's some regular expression magic to figure out the puppet version but ++# if you're on an older 0.24 version just set $puppetversion = 24 ++# ++# Before you can use any of the concat features you should include the ++# class concat::setup somewhere on your node first. ++# ++# DETAIL: ++# We use a helper shell script called concatfragments.sh that gets placed ++# in /usr/local/bin to do the concatenation. While this might seem more ++# complex than some of the one-liner alternatives you might find on the net ++# we do a lot of error checking and safety checks in the script to avoid ++# problems that might be caused by complex escaping errors etc. ++# ++# LICENSE: ++# Apache Version 2 ++# ++# LATEST: ++# http://github.com/ripienaar/puppet-concat/ ++# ++# CONTACT: ++# R.I.Pienaar <rip@devco.net> ++# Volcane on freenode ++# @ripienaar on twitter ++# www.devco.net ++ ++ ++# Sets up so that you can use fragments to build a final config file, ++# ++# OPTIONS: ++# - mode The mode of the final file ++# - owner Who will own the file ++# - group Who will own the file ++# - force Enables creating empty files if no fragments are present ++# - warn Adds a normal shell style comment top of the file indicating ++# that it is built by puppet ++# - backup Controls the filebucketing behavior of the final file and ++# see File type reference for its use. Defaults to 'puppet' ++# ++# ACTIONS: ++# - Creates fragment directories if it didn't exist already ++# - Executes the concatfragments.sh script to build the final file, this script will create ++# directory/fragments.concat. Execution happens only when: ++# * The directory changes ++# * fragments.concat != final destination, this means rebuilds will happen whenever ++# someone changes or deletes the final file. Checking is done using /usr/bin/cmp. ++# * The Exec gets notified by something else - like the concat::fragment define ++# - Copies the file over to the final destination using a file resource ++# ++# ALIASES: ++# - The exec can notified using Exec["concat_/path/to/file"] or Exec["concat_/path/to/directory"] ++# - The final file can be referened as File["/path/to/file"] or File["concat_/path/to/file"] ++define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $force = "false", $backup = "puppet") { ++ $safe_name = regsubst($name, '/', '_', 'G') ++ $concatdir = $concat::setup::concatdir ++ $version = $concat::setup::majorversion ++ $fragdir = "${concatdir}/${safe_name}" ++ $concat_name = "fragments.concat.out" ++ $default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.' ++ ++ case $warn { ++ 'true',true,yes,on: { $warnmsg = "$default_warn_message" } ++ 'false',false,no,off: { $warnmsg = "" } ++ default: { $warnmsg = "$warn" } ++ } ++ ++ $warnmsg_escaped = regsubst($warnmsg, "'", "'\\\\''", 'G') ++ $warnflag = $warnmsg_escaped ? { ++ '' => '', ++ default => "-w '$warnmsg_escaped'" ++ } ++ ++ case $force { ++ 'true',true,yes,on: { $forceflag = "-f" } ++ 'false',false,no,off: { $forceflag = "" } ++ default: { fail("Improper 'force' value given to concat: $force") } ++ } ++ ++ File{ ++ owner => root, ++ group => root, ++ mode => $mode, ++ backup => $backup ++ } ++ ++ file{$fragdir: ++ ensure => directory; ++ ++ "${fragdir}/fragments": ++ ensure => directory, ++ recurse => true, ++ purge => true, ++ force => true, ++ ignore => [".svn", ".git", ".gitignore"], ++ source => $version ? { ++ 24 => "puppet:///concat/null", ++ default => undef, ++ }, ++ notify => Exec["concat_${name}"]; ++ ++ "${fragdir}/fragments.concat": ++ ensure => present; ++ ++ "${fragdir}/${concat_name}": ++ ensure => present; ++ ++ $name: ++ source => "${fragdir}/${concat_name}", ++ owner => $owner, ++ group => $group, ++ checksum => md5, ++ mode => $mode, ++ ensure => present, ++ alias => "concat_${name}"; ++ } ++ ++ exec{"concat_${name}": ++ user => root, ++ group => root, ++ notify => File[$name], ++ subscribe => File[$fragdir], ++ alias => "concat_${fragdir}", ++ require => [ File["/usr/local/bin/concatfragments.sh"], File[$fragdir], File["${fragdir}/fragments"], File["${fragdir}/fragments.concat"] ], ++ unless => "/usr/local/bin/concatfragments.sh -o ${fragdir}/${concat_name} -d ${fragdir} -t ${warnflag} ${forceflag}", ++ command => "/usr/local/bin/concatfragments.sh -o ${fragdir}/${concat_name} -d ${fragdir} ${warnflag} ${forceflag}", ++ } ++} + +<a id="puppetmodulesconcatmanifestssetuppp">Added: puppet/modules/concat/manifests/setup.pp</a> +=================================================================== +--- puppet/modules/concat/manifests/setup.pp (rev 0) ++++ puppet/modules/concat/manifests/setup.pp 2010-11-12 17:42:22 UTC (rev 241) +@@ -0,0 +1,36 @@ ++# Sets up the concat system. ++# ++# $concatdir should point to a place where you wish the fragments to ++# live. This should not be somewhere like /tmp since ideally these files ++# should not be deleted ever, puppet should always manage them ++# ++# $puppetversion should be either 24 or 25 to enable a 24 compatible ++# mode, in 24 mode you might see phantom notifies this is a side effect ++# of the method we use to clear the fragments directory. ++# ++# The regular expression below will try to figure out your puppet version ++# but this code will only work in 0.24.8 and newer. ++# ++# It also copies out the concatfragments.sh file to /usr/local/bin ++class concat::setup { ++ $concatdir = "/var/lib/puppet/concat" ++ $majorversion = regsubst($puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') ++ ++ file{"/usr/local/bin/concatfragments.sh": ++ owner => root, ++ group => root, ++ mode => 755, ++ source => $majorversion ? { ++ 24 => "puppet:///concat/concatfragments.sh", ++ default => "puppet:///modules/concat/concatfragments.sh" ++ }; ++ ++ $concatdir: ++ ensure => directory, ++ owner => root, ++ group => root, ++ mode => 755; ++ } ++} ++ ++# vi:tabstop=4:expandtab:ai + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/d13e87ca/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/d13e87ca/attachment-0001.html new file mode 100644 index 000000000..9d8b7c26a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/d13e87ca/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[246] fix syntax</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>246</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:46:50 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix syntax</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:15 UTC (rev 245) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:50 UTC (rev 246) +@@ -96,7 +96,7 @@ + } + } + +- class default_firewall() { ++ class default_firewall { + include default_zones + include default_policy + include allow_ssh_in + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/d13e87ca/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/d13e87ca/attachment.html new file mode 100644 index 000000000..9d8b7c26a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/d13e87ca/attachment.html @@ -0,0 +1,77 @@ +<!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>[246] fix syntax</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>246</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:46:50 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix syntax</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:15 UTC (rev 245) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:46:50 UTC (rev 246) +@@ -96,7 +96,7 @@ + } + } + +- class default_firewall() { ++ class default_firewall { + include default_zones + include default_policy + include allow_ssh_in + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/ede31812/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/ede31812/attachment-0001.html new file mode 100644 index 000000000..2bc7f4e3f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/ede31812/attachment-0001.html @@ -0,0 +1,107 @@ +<!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>[249] change shorewall test dir</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>249</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:57:58 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>change shorewall test dir</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:54:59 UTC (rev 248) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:57:58 UTC (rev 249) +@@ -1,10 +1,8 @@ + class shorewall { + include concat::setup + +- $shorewalldir = "/etc/shorewall_test" +- + define shorewallfile () { +- $filename = "${shorewalldir}/${name}" ++ $filename = "/tmp/shorewall/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -29,7 +27,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "${shorewalldir}/rules" ++ $filename = "/tmp/shorewall/rules" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -56,7 +54,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "${shorewalldir}/zones" ++ $filename = "/tmp/shorewall/zones" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -76,7 +74,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "${shorewalldir}/policy" ++ $filename = "/tmp/shorewall/policy" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/ede31812/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/ede31812/attachment.html new file mode 100644 index 000000000..2bc7f4e3f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/ede31812/attachment.html @@ -0,0 +1,107 @@ +<!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>[249] change shorewall test dir</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>249</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:57:58 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>change shorewall test dir</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:54:59 UTC (rev 248) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:57:58 UTC (rev 249) +@@ -1,10 +1,8 @@ + class shorewall { + include concat::setup + +- $shorewalldir = "/etc/shorewall_test" +- + define shorewallfile () { +- $filename = "${shorewalldir}/${name}" ++ $filename = "/tmp/shorewall/${name}" + $header = "puppet:///modules/shorewall/headers/${name}" + $footer = "puppet:///modules/shorewall/footers/${name}" + concat{$filename: +@@ -29,7 +27,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "${shorewalldir}/rules" ++ $filename = "/tmp/shorewall/rules" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -56,7 +54,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "${shorewalldir}/zones" ++ $filename = "/tmp/shorewall/zones" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -76,7 +74,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "${shorewalldir}/policy" ++ $filename = "/tmp/shorewall/policy" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/efb54619/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/efb54619/attachment-0001.html new file mode 100644 index 000000000..8b76eed61 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/efb54619/attachment-0001.html @@ -0,0 +1,95 @@ +<!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>[248] fix path</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>248</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:54:59 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix path</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:49:14 UTC (rev 247) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:54:59 UTC (rev 248) +@@ -29,7 +29,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "${shorewalldir}/shorewall/rules" ++ $filename = "${shorewalldir}/rules" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -56,7 +56,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "${shorewalldir}/shorewall/zones" ++ $filename = "${shorewalldir}/zones" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -76,7 +76,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "${shorewalldir}/shorewall/policy" ++ $filename = "${shorewalldir}/policy" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/efb54619/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/efb54619/attachment.html new file mode 100644 index 000000000..8b76eed61 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/efb54619/attachment.html @@ -0,0 +1,95 @@ +<!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>[248] fix path</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>248</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 21:54:59 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix path</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:49:14 UTC (rev 247) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:54:59 UTC (rev 248) +@@ -29,7 +29,7 @@ + ### Rules + shorewallfile{ rules: } + define rule_line($order = 50) { +- $filename = "${shorewalldir}/shorewall/rules" ++ $filename = "${shorewalldir}/rules" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -56,7 +56,7 @@ + ### Zones + shorewallfile{ zones: } + define zone_line($order = 50) { +- $filename = "${shorewalldir}/shorewall/zones" ++ $filename = "${shorewalldir}/zones" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, +@@ -76,7 +76,7 @@ + ### Policy + shorewallfile{ policy: } + define policy_line($order = 50) { +- $filename = "${shorewalldir}/shorewall/policy" ++ $filename = "${shorewalldir}/policy" + $line = $name + concat::fragment{"newline_${name}": + target => $filename, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/fffd1933/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101112/fffd1933/attachment-0001.html new file mode 100644 index 000000000..dea8315c2 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/fffd1933/attachment-0001.html @@ -0,0 +1,95 @@ +<!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>[251] add newlines at end of added lines</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>251</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:29:49 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add newlines at end of added lines</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:29:17 UTC (rev 250) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:29:49 UTC (rev 251) +@@ -28,7 +28,7 @@ + shorewallfile{ rules: } + define rule_line($order = 50) { + $filename = "/tmp/shorewall/rules" +- $line = $name ++ $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + order => $order, +@@ -55,7 +55,7 @@ + shorewallfile{ zones: } + define zone_line($order = 50) { + $filename = "/tmp/shorewall/zones" +- $line = $name ++ $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + order => $order, +@@ -75,7 +75,7 @@ + shorewallfile{ policy: } + define policy_line($order = 50) { + $filename = "/tmp/shorewall/policy" +- $line = $name ++ $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + order => $order, + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101112/fffd1933/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101112/fffd1933/attachment.html new file mode 100644 index 000000000..dea8315c2 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101112/fffd1933/attachment.html @@ -0,0 +1,95 @@ +<!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>[251] add newlines at end of added lines</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>251</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2010-11-12 23:29:49 +0100 (Fri, 12 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add newlines at end of added lines</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesshorewallmanifestsinitpp">puppet/modules/shorewall/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesshorewallmanifestsinitpp">Modified: puppet/modules/shorewall/manifests/init.pp</a> +=================================================================== +--- puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:29:17 UTC (rev 250) ++++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 22:29:49 UTC (rev 251) +@@ -28,7 +28,7 @@ + shorewallfile{ rules: } + define rule_line($order = 50) { + $filename = "/tmp/shorewall/rules" +- $line = $name ++ $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + order => $order, +@@ -55,7 +55,7 @@ + shorewallfile{ zones: } + define zone_line($order = 50) { + $filename = "/tmp/shorewall/zones" +- $line = $name ++ $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + order => $order, +@@ -75,7 +75,7 @@ + shorewallfile{ policy: } + define policy_line($order = 50) { + $filename = "/tmp/shorewall/policy" +- $line = $name ++ $line = "${name}\n" + concat::fragment{"newline_${name}": + target => $filename, + order => $order, + +</pre></div> + +</body> +</html>
\ No newline at end of file |