| Index: modules/downloadserver/manifests/init.pp |
| =================================================================== |
| --- a/modules/downloadserver/manifests/init.pp |
| +++ b/modules/downloadserver/manifests/init.pp |
| @@ -93,41 +93,33 @@ class downloadserver( |
| file {'/home/rsync/.ssh': |
| ensure => directory, |
| require => User['rsync'], |
| owner => rsync, |
| mode => 0600; |
| } |
| - file {'/home/rsync/.ssh/known_hosts': |
| - ensure => file, |
| - owner => rsync, |
| - mode => 0444, |
| - source => 'puppet:///modules/downloadserver/known_hosts' |
| - } |
| - |
| file {'/home/rsync/.ssh/id_rsa': |
| ensure => file, |
| owner => rsync, |
| mode => 0400, |
| source => 'puppet:///modules/private/rsync@downloads.adblockplus.org' |
| } |
| file {'/home/rsync/.ssh/id_rsa.pub': |
| ensure => file, |
| owner => rsync, |
| mode => 0400, |
| source => 'puppet:///modules/private/rsync@downloads.adblockplus.org.pub' |
| } |
| cron {'mirror-devbuilds': |
| ensure => present, |
| - require => [File['/home/rsync/.ssh/known_hosts'], |
| - File['/home/rsync/.ssh/id_rsa'], |
| + require => [File['/home/rsync/.ssh/id_rsa'], |
| File['/var/www/devbuilds']], |
| - command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /var/www/devbuilds', |
| + command => 'rsync -e ssh -ltprz --delete devbuilds@server16.adblockplus.org:. /var/www/devbuilds', |
| environment => hiera('cron::environment', []), |
| user => rsync, |
| hour => '*', |
| minute => '4-54/10' |
| } |
| } |