[Mageia-sysadm] [101] - merge the current puppet snapshot system with the new module

[root at mageia.org]

Revision: 101
Author:   misc
Date:     2010-11-04 19:25:13 +0100 (Thu, 04 Nov 2010)
Log Message:
-----------
- merge the current puppet snapshot system with the new module

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

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2010-11-04 18:25:08 UTC (rev 100)
+++ puppet/manifests/nodes.pp	2010-11-04 18:25:13 UTC (rev 101)
@@ -17,34 +17,13 @@
     include rsyncd
     include mirror
     include openldap::master 
+    include subversion::client
+    
 
-    # for puppet svn checkout
-    package {"subversion":
-        ensure => "installed"
+    subversion::snapshot { "/etc/puppet":
+        source => "svn://vm-gandi.mageia.org/adm/puppet/"
     }
 
-    # svn spam log with 
-    # Oct 26 13:30:01 valstar svn: No worthy mechs found
-    # without it, source http://mail-index.netbsd.org/pkgsrc-users/2008/11/23/msg008706.html 
-    # 
-    package {"lib64sasl2-plug-anonymous":
-        ensure => "installed"
-    }
-
-    # update the puppet snapshot 
-    cron { puppet_update:
-           command => "cd /etc/puppet && /usr/bin/svn update -q",
-           user => root,
-           minute => '*/5'
-    }
-
-    exec { puppet_etc:
-        cwd => "/etc/",
-        command => "/usr/bin/svn co svn://vm-gandi.mageia.org/adm/puppet/",
-        user => "root",
-        creates => "/etc/puppet/manifests/site.pp"
-    }
-
     file { "extdata":
         path => "/etc/puppet/extdata",
         ensure => directory,

Modified: puppet/modules/subversion/manifests/init.pp
===================================================================
--- puppet/modules/subversion/manifests/init.pp	2010-11-04 18:25:08 UTC (rev 100)
+++ puppet/modules/subversion/manifests/init.pp	2010-11-04 18:25:13 UTC (rev 101)
@@ -33,6 +33,13 @@
         package { subversion:
             ensure => installed,
         }
+        # svn spam log with 
+        # Oct 26 13:30:01 valstar svn: No worthy mechs found
+        # without it, source http://mail-index.netbsd.org/pkgsrc-users/2008/11/23/msg008706.html 
+        # 
+        package {"lib64sasl2-plug-anonymous":
+            ensure => "installed"
+        }
     }
 
     # TODO ensure that subversion ishere
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101104/a56f9ee8/attachment.html>