summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/001696.html
blob: 030adad3ca7d19eddea5765801942bf1195b40c4 (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
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [708] send svn module name to cia
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B708%5D%20send%20svn%20module%20name%20to%20cia&In-Reply-To=%3C20110107190213.9803341BC0%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="001695.html">
   <LINK REL="Next"  HREF="001697.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [708] send svn module name to cia</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B708%5D%20send%20svn%20module%20name%20to%20cia&In-Reply-To=%3C20110107190213.9803341BC0%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [708] send svn module name to cia">root at mageia.org
       </A><BR>
    <I>Fri Jan  7 20:02:13 CET 2011</I>
    <P><UL>
        <LI>Previous message: <A HREF="001695.html">[Mageia-sysadm] [707] use domain variable
</A></li>
        <LI>Next message: <A HREF="001697.html">[Mageia-sysadm] [709] fix syntax error
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1696">[ date ]</a>
              <a href="thread.html#1696">[ thread ]</a>
              <a href="subject.html#1696">[ subject ]</a>
              <a href="author.html#1696">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 708
Author:   boklm
Date:     2011-01-07 20:02:13 +0100 (Fri, 07 Jan 2011)
Log Message:
-----------
send svn module name to cia

Modified Paths:
--------------
    puppet/manifests/nodes.pp
    puppet/modules/subversion/manifests/init.pp
    puppet/modules/subversion/templates/ciabot_svn.sh

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2011-01-07 18:32:00 UTC (rev 707)
+++ puppet/manifests/nodes.pp	2011-01-07 19:02:13 UTC (rev 708)
@@ -30,6 +30,8 @@
         group =&gt; &quot;mga-sysadmin&quot;,
         commit_mail =&gt; ['<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>', &quot;<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">sysadmin-commits at ml.</A>$domain&quot;],
         syntax_check =&gt; ['check_puppet_templates','check_puppet'],
+	cia_post =&gt; true,
+	cia_module =&gt; &quot;mageia-sysadm&quot;,
     }
 
     subversion::snapshot { &quot;/etc/puppet&quot;:

Modified: puppet/modules/subversion/manifests/init.pp
===================================================================
--- puppet/modules/subversion/manifests/init.pp	2011-01-07 18:32:00 UTC (rev 707)
+++ puppet/modules/subversion/manifests/init.pp	2011-01-07 19:02:13 UTC (rev 708)
@@ -124,6 +124,7 @@
                        $public = true,
                        $commit_mail = '',
                        $cia_post = true,
+                       $cia_module = 'default',
                        $syntax_check = '',
                        $extract_dir = '') {
         # check permissions

Modified: puppet/modules/subversion/templates/ciabot_svn.sh
===================================================================
--- puppet/modules/subversion/templates/ciabot_svn.sh	2011-01-07 18:32:00 UTC (rev 707)
+++ puppet/modules/subversion/templates/ciabot_svn.sh	2011-01-07 19:02:13 UTC (rev 708)
@@ -64,6 +64,7 @@
 #       putting that here.
 #
 project_name=&quot;Mageia&quot;
+module_name=&quot;&lt;% cia_module %&gt;&quot;
 return_address=&quot;root@&lt;%= domain %&gt;&quot;
 
 # System
@@ -98,6 +99,7 @@
     &lt;/generator&gt;
     &lt;source&gt;
         &lt;project&gt;$project_name&lt;/project&gt;
+	&lt;module&gt;$module_name&lt;/module&gt;
     &lt;/source&gt;
     &lt;body&gt;
         &lt;commit&gt;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20110107/41e22236/attachment-0001.html&gt;
</PRE>





















<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="001695.html">[Mageia-sysadm] [707] use domain variable
</A></li>
	<LI>Next message: <A HREF="001697.html">[Mageia-sysadm] [709] fix syntax error
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1696">[ date ]</a>
              <a href="thread.html#1696">[ thread ]</a>
              <a href="subject.html#1696">[ subject ]</a>
              <a href="author.html#1696">[ 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>