Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/downloadserver/manifests/init.pp

Issue 29363779: Issue 4663 - Remove ~rsync/.ssh/known_hosts resource and update download source (Closed)
Patch Set: Created Nov. 22, 2016, 4:07 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/downloadserver/files/known_hosts ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/downloadserver/manifests/init.pp
diff --git a/modules/downloadserver/manifests/init.pp b/modules/downloadserver/manifests/init.pp
index 5d0f106d1ed8a6971c7861c33d0a6805d28db488..b401e8309000c254c8519ff55877c366fcb4b99f 100644
--- a/modules/downloadserver/manifests/init.pp
+++ b/modules/downloadserver/manifests/init.pp
@@ -98,13 +98,6 @@ class downloadserver(
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,
@@ -121,10 +114,11 @@ class downloadserver(
cron {'mirror-devbuilds':
ensure => present,
- require => [File['/home/rsync/.ssh/known_hosts'],
- File['/home/rsync/.ssh/id_rsa'],
- File['/var/www/devbuilds']],
- command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /var/www/devbuilds',
+ require => [
+ File['/home/rsync/.ssh/id_rsa'],
+ File['/var/www/devbuilds'],
+ ],
+ command => 'rsync -e ssh -ltprz --delete devbuilds@server16.adblockplus.org:. /var/www/devbuilds',
environment => hiera('cron::environment', []),
user => rsync,
hour => '*',
« no previous file with comments | « modules/downloadserver/files/known_hosts ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld