diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-10-26 20:26:43 +0500 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-10-26 20:26:43 +0500 |
| commit | 1fb6bbb0cbb0cee505bb0feb743adf21a0fc24a7 (patch) | |
| tree | fee927093a0a23656608a05ec53e0a4989675091 /scripts/vyatta-load-config.pl | |
| parent | 76c30a8d299c6887512e843534c44546f0074e12 (diff) | |
| parent | a04116d13ea5968403259c37fc55e618a98b9dd9 (diff) | |
| download | vyatta-cfg-1fb6bbb0cbb0cee505bb0feb743adf21a0fc24a7.tar.gz vyatta-cfg-1fb6bbb0cbb0cee505bb0feb743adf21a0fc24a7.zip | |
Merge pull request #5 from elonhub/add-sftp
Bug 584 - Allow sftp as copy and commit-archive location destination
Diffstat (limited to 'scripts/vyatta-load-config.pl')
| -rwxr-xr-x | scripts/vyatta-load-config.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl index dc9ad6e..517b7ff 100755 --- a/scripts/vyatta-load-config.pl +++ b/scripts/vyatta-load-config.pl @@ -78,7 +78,8 @@ if ( $load_file =~ /^[^\/]\w+:\// ) { unless( $proto eq 'tftp' || $proto eq 'ftp' || $proto eq 'http' || - $proto eq 'scp' ) { + $proto eq 'scp' || + $proto eq 'sftp' ) { die "Invalid url protocol [$proto]\n"; } } else { @@ -127,8 +128,8 @@ elsif ( $mode eq 'url' ) { } } my $rc = system("curl -# -o $url_tmp_file $load_file"); - if ($proto eq 'scp' && ($rc >> 8) == 51){ - $load_file =~ m/scp:\/\/(.*?)\//; + if ($proto =~ /^(scp|sftp)$/ && ($rc >> 8) == 51){ + $load_file =~ m/(?:scp|sftp):\/\/(.*?)\//; my $host = $1; if ($host =~ m/.*@(.*)/) { $host = $1; |