From 9b5429d82a49d567d28b9953f86d688977bb0fb2 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Thu, 4 Nov 2010 18:25:13 +0000
Subject: - merge the current puppet snapshot system with the new module

---
 manifests/nodes.pp                   | 29 ++++-------------------------
 modules/subversion/manifests/init.pp |  7 +++++++
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 5550e373..a4b91d9a 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -17,32 +17,11 @@ node valstar {
     include rsyncd
     include mirror
     include openldap::master 
+    include subversion::client
+    
 
-    # for puppet svn checkout
-    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"
-    }
-
-    # 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"
+    subversion::snapshot { "/etc/puppet":
+        source => "svn://vm-gandi.mageia.org/adm/puppet/"
     }
 
     file { "extdata":
diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp
index 1904de0e..dc00fe2e 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -33,6 +33,13 @@ class subversion {
         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
-- 
cgit v1.2.1