aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-01-18 16:50:59 +0000
committerNicolas Vigier <boklm@mageia.org>2011-01-18 16:50:59 +0000
commitdb9f37b4915ead275f11be3fab2520bec0add6ec (patch)
tree3b2b8a6f74707bc2b82df8cef6462975b1e158e4 /modules
parent02d7e04e43aa5032c113728d087c12cb50a580e8 (diff)
downloadpuppet-db9f37b4915ead275f11be3fab2520bec0add6ec.tar
puppet-db9f37b4915ead275f11be3fab2520bec0add6ec.tar.gz
puppet-db9f37b4915ead275f11be3fab2520bec0add6ec.tar.bz2
puppet-db9f37b4915ead275f11be3fab2520bec0add6ec.tar.xz
puppet-db9f37b4915ead275f11be3fab2520bec0add6ec.zip
- add mirrordir define
- use $bindir variable - scripts owned by root:root
Diffstat (limited to 'modules')
-rw-r--r--modules/mirror/manifests/init.pp30
1 files changed, 25 insertions, 5 deletions
diff --git a/modules/mirror/manifests/init.pp b/modules/mirror/manifests/init.pp
index 5a752f81..8d790466 100644
--- a/modules/mirror/manifests/init.pp
+++ b/modules/mirror/manifests/init.pp
@@ -1,6 +1,7 @@
class mirror {
class base {
- file { "/home/mirror/bin/":
+ $bindir = '/home/mirror/bin'
+ file { "$bindir":
ensure => directory,
owner => mirror,
group => mirror,
@@ -20,13 +21,32 @@ class mirror {
}
}
+ define mirrordir ($remotehost, $remotedir, $localdir) {
+ include base
+ file { "mirror_$name":
+ path => "$bindir/$name",
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 755,
+ content => template("mirror/mirrordir"),
+ }
+
+ cron { "mirror_$name":
+ user => mirror,
+ minute => [0, 10, 20, 30, 40, 50],
+ command => "$bindir/$name",
+ require => File["$name"],
+ }
+ }
+
# For main Mageia mirror
class main inherits base {
file { "update_timestamp":
- path => "/home/mirror/bin/update_timestamp",
+ path => "$bindir/update_timestamp",
ensure => present,
- owner => mirror,
- group => mirror,
+ owner => root,
+ group => root,
mode => 755,
content => template("mirror/update_timestamp")
}
@@ -35,7 +55,7 @@ class mirror {
user => mirror,
hour => 10,
minute => 14,
- command => "~mirror/bin/update_timestamp",
+ command => "$bindir/update_timestamp",
require => File["update_timestamp"],
}
}