summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2010-December/001200.html
blob: f2c01a2c1ee0f41b2aad81c2d2ba78e3f8944da9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [607] do not use @ in filename,	this confuse sympa ( and so, replace it by
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B607%5D%20do%20not%20use%20%40%20in%20filename%2C%0A%09this%20confuse%20sympa%20%28%20and%20so%2C%20replace%20it%20by&In-Reply-To=%3C20101214182944.A205A40267%40valstar.mageia.org%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="001199.html">
   <LINK REL="Next"  HREF="001201.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [607] do not use @ in filename,	this confuse sympa ( and so, replace it by</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B607%5D%20do%20not%20use%20%40%20in%20filename%2C%0A%09this%20confuse%20sympa%20%28%20and%20so%2C%20replace%20it%20by&In-Reply-To=%3C20101214182944.A205A40267%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [607] do not use @ in filename,	this confuse sympa ( and so, replace it by">root at mageia.org
       </A><BR>
    <I>Tue Dec 14 19:29:44 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="001199.html">[Mageia-sysadm] [606] fix filename to match the one use in other	config file
</A></li>
        <LI>Next message: <A HREF="001201.html">[Mageia-sysadm] [608] fix filename, as this prevent list creation
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1200">[ date ]</a>
              <a href="thread.html#1200">[ thread ]</a>
              <a href="subject.html#1200">[ subject ]</a>
              <a href="author.html#1200">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 607
Author:   misc
Date:     2010-12-14 19:29:44 +0100 (Tue, 14 Dec 2010)
Log Message:
-----------
do not use @ in filename, this confuse sympa ( and so, replace it by
-at- )

Modified Paths:
--------------
    puppet/modules/sympa/manifests/init.pp
    puppet/modules/sympa/templates/config

Modified: puppet/modules/sympa/manifests/init.pp
===================================================================
--- 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 = &quot;/etc/sympa/lists_xml/$name.xml&quot;
 
+        if $sender_email {
+            $sender_email_file = regsubst($sender_email,'\@','-at-')
+        } else { 
+            $sender_email_file = '' 
+        }
+
         file { &quot;$xml_file&quot;:
             owner =&gt; root,
             group =&gt; 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: }
             }
         }
         

Modified: puppet/modules/sympa/templates/config
===================================================================
--- 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 @@
 
 &lt;% if sender_email  %&gt;
 #TODO write scenari
-send restricted_&lt;%= sender_email %&gt;
+send restricted_&lt;%= sender_email_file %&gt;
 
 &lt;% elsif sender_ldap_group %&gt;
 #TODO write scenari
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20101214/f190ee87/attachment.html&gt;
</PRE>






<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="001199.html">[Mageia-sysadm] [606] fix filename to match the one use in other	config file
</A></li>
	<LI>Next message: <A HREF="001201.html">[Mageia-sysadm] [608] fix filename, as this prevent list creation
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1200">[ date ]</a>
              <a href="thread.html#1200">[ thread ]</a>
              <a href="subject.html#1200">[ subject ]</a>
              <a href="author.html#1200">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>