aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2015-11-17 02:54:44 +0100
committerOlivier Blin <dev@blino.org>2015-11-17 21:26:03 +0100
commit95fc19358858595b96a2b01cfc8357345005dd9b (patch)
treef0924bdac7271cd6a7dfbe2506493cfd74aaab8e
parent3080449bbea5bd0f939f10ce7074c85cdc352e41 (diff)
downloadiurt-95fc19358858595b96a2b01cfc8357345005dd9b.tar
iurt-95fc19358858595b96a2b01cfc8357345005dd9b.tar.gz
iurt-95fc19358858595b96a2b01cfc8357345005dd9b.tar.bz2
iurt-95fc19358858595b96a2b01cfc8357345005dd9b.tar.xz
iurt-95fc19358858595b96a2b01cfc8357345005dd9b.zip
Drop arcfour cipher usage (not enabled by default in latest openssh packages)
-rwxr-xr-xiurt4
-rw-r--r--lib/Iurt/Util.pm4
2 files changed, 4 insertions, 4 deletions
diff --git a/iurt b/iurt
index 570f9d5..43136b6 100755
--- a/iurt
+++ b/iurt
@@ -715,7 +715,7 @@ if (!$run{stop}) {
if ($config->{rsync_to} && !$run{no_rsync}) {
# remove some old and very big log files not to saturate the server
system(qq(find $local_spool/log/ -name "*.log" \\( -size +$config->{log_size_limit} -or -mtime +$config->{log_size_date} \\) -exec rm -f {} \\;));
- system('rsync', '--delete', '-alHPe', 'ssh -xc arcfour', "$local_spool/log/", "$config->{rsync_to}/$run{distro_tag}/$run{my_arch}/$run{media}/log/");
+ system('rsync', '--delete', '-alHPe', 'ssh -x', "$local_spool/log/", "$config->{rsync_to}/$run{distro_tag}/$run{my_arch}/$run{media}/log/");
}
# The next loop should be moved in a module someday
@@ -1069,7 +1069,7 @@ send_status_mail(\%run, $config, $cache) if $run{status_mail};
if ($config->{rsync_to} && !$run{no_rsync}) {
# remove some old and very big log files not to saturate the server
system(qq(find $local_spool/log/ -name "*.log" \\( -size +$config->{log_size_limit} -or -mtime +$config->{log_size_date} \\) -exec rm -f {} \\;));
- system('rsync', '--delete', '-alHPe', 'ssh -xc arcfour', "$local_spool/log/", "$config->{rsync_to}/$run{distro_tag}/$run{my_arch}/$run{media}/log/");
+ system('rsync', '--delete', '-alHPe', 'ssh -x', "$local_spool/log/", "$config->{rsync_to}/$run{distro_tag}/$run{my_arch}/$run{media}/log/");
}
unlink "$run{pidfile_home}/$run{pidfile}" if $run{pidfile};
diff --git a/lib/Iurt/Util.pm b/lib/Iurt/Util.pm
index fa6f37f..f9dfa9f 100644
--- a/lib/Iurt/Util.pm
+++ b/lib/Iurt/Util.pm
@@ -180,7 +180,7 @@ local location I<$to>, using host and user specified in ssh_setup().
sub sget {
my $conf = shift;
my ($_opt, $user, $host) = @$conf;
- system('scp', '-q', '-rc', 'arcfour', "$user\@$host:$_[0]", $_[1]);
+ system('scp', '-q', '-r', "$user\@$host:$_[0]", $_[1]);
}
=item sput($handle, $from, $to)
@@ -195,7 +195,7 @@ location I<$to>, using host and user specified in ssh_setup().
sub sput {
my $conf = shift;
my ($_opt, $user, $host) = @$conf;
- system('scp', '-q', '-rc', 'arcfour', $_[0], "$user\@$host:$_[1]");
+ system('scp', '-q', '-r', $_[0], "$user\@$host:$_[1]");
}
=back