<!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>[607] do not use @ in filename, this confuse sympa ( and so, replace it by</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>607</dd>
<dt>Author</dt> <dd>misc</dd>
<dt>Date</dt> <dd>2010-12-14 19:29:44 +0100 (Tue, 14 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>do not use @ in filename, this confuse sympa ( and so, replace it by
-at- )</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</a></li>
<li><a href="#puppetmodulessympatemplatesconfig">puppet/modules/sympa/templates/config</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-14 18:29:43 UTC (rev 606)
+++ puppet/modules/sympa/manifests/init.pp 2010-12-14 18:29:44 UTC (rev 607)
@@ -164,6 +164,12 @@
$xml_file = "/etc/sympa/lists_xml/$name.xml"
+ if $sender_email {
+ $sender_email_file = regsubst($sender_email,'\@','-at-')
+ } else {
+ $sender_email_file = ''
+ }
+
file { "$xml_file":
owner => root,
group => root,
@@ -191,8 +197,8 @@
}
if $sender_email {
- if ! defined(Sympa::Server::Scenario_sender_email[$sender_email]) {
- sympa::server::scenario_sender_email { $sender_email: }
+ if ! defined(Sympa::Server::Scenario_sender_email[$sender_email_file]) {
+ sympa::server::scenario_sender_email { $sender_email_file: }
}
}
<a id="puppetmodulessympatemplatesconfig">Modified: puppet/modules/sympa/templates/config</a>
===================================================================
--- puppet/modules/sympa/templates/config 2010-12-14 18:29:43 UTC (rev 606)
+++ puppet/modules/sympa/templates/config 2010-12-14 18:29:44 UTC (rev 607)
@@ -42,7 +42,7 @@
<% if sender_email %>
#TODO write scenari
-send restricted_<%= sender_email %>
+send restricted_<%= sender_email_file %>
<% elsif sender_ldap_group %>
#TODO write scenari
</pre></div>
</body>
</html>