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

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

Issue 4865011998523392: Change ssh keys to ecdsa (Closed)
Patch Set: Created Nov. 18, 2013, 4:17 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
Index: modules/filterserver/manifests/init.pp
===================================================================
--- a/modules/filterserver/manifests/init.pp
+++ b/modules/filterserver/manifests/init.pp
@@ -102,7 +102,7 @@
order => 2,
}
- file {'/home/rsync/.ssh/id_rsa':
+ file {'/home/rsync/.ssh/id_ecdsa':
Wladimir Palant 2013/11/18 17:36:23 Actually, this change should be reverted - for ide
ensure => file,
require => [
File['/home/rsync/.ssh'],
@@ -113,7 +113,7 @@
source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.org'
}
- file {'/home/rsync/.ssh/id_rsa.pub':
+ file {'/home/rsync/.ssh/id_ecdsa.pub':
ensure => file,
require => [
File['/home/rsync/.ssh'],
@@ -128,10 +128,10 @@
ensure => present,
require => [
File['/home/rsync/.ssh/known_hosts'],
- File['/home/rsync/.ssh/id_rsa'],
+ File['/home/rsync/.ssh/id_ecdsa'],
User['rsync']
],
- command => 'rsync -e ssh -ltprz --delete rsync@filtermaster.adblockplus.org:. /var/www/easylist/',
+ command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermaster.adblockplus.org:. /var/www/easylist/',
Felix Dahlke 2013/11/18 16:29:22 This seems unrelated, but I guess this is what we
environment => ['MAILTO=admins@adblockplus.org,root'],
user => rsync,
hour => '*',
« no previous file with comments | « modules/filtermaster/manifests/init.pp ('k') | modules/private-stub/files/filtermaster.adblockplus.org_ssh.key » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld