[Mageia-sysadm] [708] send svn module name to cia

Fri Jan 7 20:02:13 CET 2011

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 => "mga-sysadmin",
         commit_mail => ['mageia-sysadm at mageia.org', "sysadmin-commits at ml.$domain"],
         syntax_check => ['check_puppet_templates','check_puppet'],
+	cia_post => true,
+	cia_module => "mageia-sysadm",
     }
 
     subversion::snapshot { "/etc/puppet":

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="Mageia"
+module_name="<% cia_module %>"
 return_address="root@<%= domain %>"
 
 # System
@@ -98,6 +99,7 @@
     </generator>
     <source>
         <project>$project_name</project>
+	<module>$module_name</module>
     </source>
     <body>
         <commit>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110107/41e22236/attachment-0001.html>
