aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/nodes.pp
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-04 18:25:13 +0000
committerMichael Scherer <misc@mageia.org>2010-11-04 18:25:13 +0000
commit9b5429d82a49d567d28b9953f86d688977bb0fb2 (patch)
treebdee45b9f3d10b5162967e96f4fac3a675fe5ac2 /manifests/nodes.pp
parent7728f62f235c2637397d323d8f906878841a8d75 (diff)
downloadpuppet-9b5429d82a49d567d28b9953f86d688977bb0fb2.tar
puppet-9b5429d82a49d567d28b9953f86d688977bb0fb2.tar.gz
puppet-9b5429d82a49d567d28b9953f86d688977bb0fb2.tar.bz2
puppet-9b5429d82a49d567d28b9953f86d688977bb0fb2.tar.xz
puppet-9b5429d82a49d567d28b9953f86d688977bb0fb2.zip
- merge the current puppet snapshot system with the new module
Diffstat (limited to 'manifests/nodes.pp')
-rw-r--r--manifests/nodes.pp29
1 files changed, 4 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":