diff options
Diffstat (limited to 'modules/mirror/manifests')
| -rw-r--r-- | modules/mirror/manifests/base.pp | 1 | ||||
| -rw-r--r-- | modules/mirror/manifests/mageia.pp | 2 | ||||
| -rw-r--r-- | modules/mirror/manifests/main.pp | 4 | ||||
| -rw-r--r-- | modules/mirror/manifests/mirrordir.pp | 10 |
4 files changed, 8 insertions, 9 deletions
diff --git a/modules/mirror/manifests/base.pp b/modules/mirror/manifests/base.pp index 7470547d..db48f808 100644 --- a/modules/mirror/manifests/base.pp +++ b/modules/mirror/manifests/base.pp @@ -10,7 +10,6 @@ class mirror::base { group { 'mirror': } user { 'mirror': - comment => 'System user use to run mirror scripts', gid => 'mirror', } } diff --git a/modules/mirror/manifests/mageia.pp b/modules/mirror/manifests/mageia.pp index 4b39ccb8..c14a09bb 100644 --- a/modules/mirror/manifests/mageia.pp +++ b/modules/mirror/manifests/mageia.pp @@ -1,7 +1,7 @@ class mirror::mageia { include mirror::base mirrordir { 'mageia': - remoteurl => "rsync://rsync.$::domain/mageia", + remoteurl => "rsync://rsync.${::domain}/mageia", localdir => '/distrib/mageia', } } diff --git a/modules/mirror/manifests/main.pp b/modules/mirror/manifests/main.pp index 2fef6800..f368038d 100644 --- a/modules/mirror/manifests/main.pp +++ b/modules/mirror/manifests/main.pp @@ -1,7 +1,7 @@ # For main Mageia mirror class mirror::main { include mirror::base - mga-common::local_script { 'update_timestamp': + mga_common::local_script { 'update_timestamp': content => template('mirror/update_timestamp') } @@ -9,6 +9,6 @@ class mirror::main { user => 'mirror', minute => '*/10', command => '/usr/local/bin/update_timestamp', - require => [Local_script['update_timestamp'], User['mirror']], + require => [Mga_common::Local_script['update_timestamp'], User['mirror']], } } diff --git a/modules/mirror/manifests/mirrordir.pp b/modules/mirror/manifests/mirrordir.pp index 49367116..2100bc6c 100644 --- a/modules/mirror/manifests/mirrordir.pp +++ b/modules/mirror/manifests/mirrordir.pp @@ -2,7 +2,7 @@ define mirror::mirrordir ($remoteurl, $localdir, $rsync_options='-avH --delete') { include mirror::base - $lockfile = "$mirror::base::locksdir/$name" + $lockfile = "${mirror::base::locksdir}/${name}" file { $localdir: ensure => directory, @@ -10,14 +10,14 @@ define mirror::mirrordir ($remoteurl, group => 'mirror', } - mga-common::local_script { "mirror_$name": + mga_common::local_script { "mirror_${name}": content => template('mirror/mirrordir'), } - cron { "mirror_$name": + cron { "mirror_${name}": user => mirror, minute => '*/10', - command => "/usr/local/bin/mirror_$name", - require => Local_script["mirror_$name"], + command => "/usr/local/bin/mirror_${name}", + require => Mga_common::Local_script["mirror_${name}"], } } |
