1.4.6c - merged @gusson's --sshport argument enhancement for syncoid
This commit is contained in:
parent
cd19307ab4
commit
c0f065b0f0
|
@ -1,8 +1,5 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
1.4.6c merged @gusson's pull request to add -sshport argument
|
1.4.6c merged @gusson's pull request to add -sshport argument
|
||||||
|
|
||||||
>>>>>>> gusson-ssh_port
|
|
||||||
1.4.6b updated default cipherlist for syncoid to
|
1.4.6b updated default cipherlist for syncoid to
|
||||||
chacha20-poly1305@openssh.com,arcfour - arcfour isn't supported on
|
chacha20-poly1305@openssh.com,arcfour - arcfour isn't supported on
|
||||||
newer SSH (in Ubuntu Xenial and FreeBSD), chacha20 isn't supported on
|
newer SSH (in Ubuntu Xenial and FreeBSD), chacha20 isn't supported on
|
||||||
|
|
4
findoid
4
findoid
|
@ -11,11 +11,7 @@ use warnings;
|
||||||
my $zfs = '/sbin/zfs';
|
my $zfs = '/sbin/zfs';
|
||||||
my %args = getargs(@ARGV);
|
my %args = getargs(@ARGV);
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
my $progversion = '1.4.6b';
|
|
||||||
=======
|
|
||||||
my $progversion = '1.4.6c';
|
my $progversion = '1.4.6c';
|
||||||
>>>>>>> gusson-ssh_port
|
|
||||||
|
|
||||||
if ($args{'version'}) { print "$progversion\n"; exit 0; }
|
if ($args{'version'}) { print "$progversion\n"; exit 0; }
|
||||||
|
|
||||||
|
|
4
sanoid
4
sanoid
|
@ -4,11 +4,7 @@
|
||||||
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
|
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
|
||||||
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
my $version = '1.4.6b';
|
|
||||||
=======
|
|
||||||
my $version = '1.4.6c';
|
my $version = '1.4.6c';
|
||||||
>>>>>>> gusson-ssh_port
|
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use Config::IniFiles; # read samba-style conf file
|
use Config::IniFiles; # read samba-style conf file
|
||||||
|
|
7
syncoid
7
syncoid
|
@ -4,11 +4,7 @@
|
||||||
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
|
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
|
||||||
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
my $version = '1.4.6b';
|
|
||||||
=======
|
|
||||||
my $version = '1.4.6c';
|
my $version = '1.4.6c';
|
||||||
>>>>>>> gusson-ssh_port
|
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
|
@ -30,10 +26,7 @@ my $zfscmd = '/sbin/zfs';
|
||||||
my $sshcmd = '/usr/bin/ssh';
|
my $sshcmd = '/usr/bin/ssh';
|
||||||
my $pscmd = '/bin/ps';
|
my $pscmd = '/bin/ps';
|
||||||
my $sshcipher = '-c chacha20-poly1305@openssh.com,arcfour';
|
my $sshcipher = '-c chacha20-poly1305@openssh.com,arcfour';
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
my $sshport = '-p 22';
|
my $sshport = '-p 22';
|
||||||
>>>>>>> gusson-ssh_port
|
|
||||||
my $pvcmd = '/usr/bin/pv';
|
my $pvcmd = '/usr/bin/pv';
|
||||||
my $mbuffercmd = '/usr/bin/mbuffer';
|
my $mbuffercmd = '/usr/bin/mbuffer';
|
||||||
my $sudocmd = '/usr/bin/sudo';
|
my $sudocmd = '/usr/bin/sudo';
|
||||||
|
|
Loading…
Reference in New Issue