diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101209/5ea67dbe/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101209/5ea67dbe/attachment-0001.html | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101209/5ea67dbe/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101209/5ea67dbe/attachment-0001.html new file mode 100644 index 000000000..cdff4bc2c --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101209/5ea67dbe/attachment-0001.html @@ -0,0 +1,144 @@ +<!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>[562] - use a variable for the robot and http vhost ( and force https in www</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>562</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-12-09 13:34:29 +0100 (Thu, 09 Dec 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- use a variable for the robot and http vhost ( and force https in www + sympa config too )</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</a></li> +<li><a href="#puppetmodulessympatemplatessympaconf">puppet/modules/sympa/templates/sympa.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulessympamanifestsinitpp">Modified: puppet/modules/sympa/manifests/init.pp</a> +=================================================================== +--- puppet/modules/sympa/manifests/init.pp 2010-12-09 12:34:28 UTC (rev 561) ++++ puppet/modules/sympa/manifests/init.pp 2010-12-09 12:34:29 UTC (rev 562) +@@ -1,5 +1,9 @@ + class sympa { +- class server { ++ class variable { ++ $vhost = "ml.$domain" ++ } ++ ++ class server inherits variable { + # perl-CGI-Fast is needed for fast cgi + # perl-Socket6 is required by perl-IO-Socket-SSL + # (optional requirement) +@@ -49,13 +53,13 @@ + webapp_file => "sympa/webapp_sympa.conf", + } + +- apache::vhost_redirect_ssl { "ml.$domain": } ++ apache::vhost_redirect_ssl { "$vhost": } + +- apache::vhost_other_app { "ml.$domain": ++ apache::vhost_other_app { "$vhost": + vhost_file => "sympa/vhost_ml.conf", + } + +- openssl::self_signed_cert{ "ml.$domain": ++ openssl::self_signed_cert{ "$vhost": + directory => "/etc/ssl/apache/" + } + +@@ -80,6 +84,8 @@ + + define list($subject, $profile, $language = 'en') { + ++ include sympa::variable ++ + $xml_file = "/etc/sympa/lists_xml/$name.xml" + + file { "$xml_file": +@@ -88,7 +94,7 @@ + content => template('sympa/list.xml') + } + +- exec { "sympa.pl --create_list --robot=ml.$domain --input_file=$xml_file": ++ exec { "sympa.pl --create_list --robot=$sympa::variable::vhost --input_file=$xml_file": + refreshonly => true, + subscribe => File["$xml_file"] + } + +<a id="puppetmodulessympatemplatessympaconf">Modified: puppet/modules/sympa/templates/sympa.conf</a> +=================================================================== +--- puppet/modules/sympa/templates/sympa.conf 2010-12-09 12:34:28 UTC (rev 561) ++++ puppet/modules/sympa/templates/sympa.conf 2010-12-09 12:34:29 UTC (rev 562) +@@ -86,11 +86,11 @@ + ###\\\\ General definition ////### + + ## Main robot hostname +-domain ml.<%= domain %> ++domain <%= vhost %> + + ## Listmasters email list comma separated + ## Sympa will associate listmaster privileges to these email addresses (mail and web interfaces). Some error reports may also be sent to these addresses. +-listmaster listmaster@ml.<%= domain %> ++listmaster listmaster@<%= vhost %> + + ## Local part of sympa email adresse + ## Effective address will be \[EMAIL\]@\[HOST\] +@@ -278,7 +278,7 @@ + ###\\\\ Web interface ////### + + ## Sympa's main page URL +-wwsympa_url http://ml.<%= domain %>/ ++wwsympa_url https://<%= vhost %>/ + + ## If a spam filter (like spamassassin or j-chkmail) add a smtp headers to tag spams, name of this header (example X-Spam-Status) + antispam_tag_header_name X-Spam-Status + +</pre></div> + +</body> +</html>
\ No newline at end of file |