From dc0c072ab500873b59b7615ac0107f59cafe44a0 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 20 Oct 2020 15:45:33 +0200 Subject: [PATCH] add application protocol attribut for HTTP --- FHEM/98_backupToStorage.pm | 3 ++- controls_backupToStorage.txt | 4 ++-- lib/FHEM/backupToStorage.pm | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/FHEM/98_backupToStorage.pm b/FHEM/98_backupToStorage.pm index 1a83a7e..45cf93d 100644 --- a/FHEM/98_backupToStorage.pm +++ b/FHEM/98_backupToStorage.pm @@ -55,6 +55,7 @@ sub backupToStorage_Initialize { 'bTS_Host ' . 'bTS_User ' . 'bTS_Path ' + . 'bTS_Proto:https,http ' . 'bTS_Type:Nextcloud'; $hash->{parseParams} = 1; @@ -175,7 +176,7 @@ sub backupToStorage_Initialize { ], "release_status": "devepolment", "license": "GPL_2", - "version": "v1.0.1", + "version": "v1.1.0", "author": [ "Marko Oldenburg " ], diff --git a/controls_backupToStorage.txt b/controls_backupToStorage.txt index 9904d3d..a1d9dc0 100644 --- a/controls_backupToStorage.txt +++ b/controls_backupToStorage.txt @@ -1,2 +1,2 @@ -UPD 2020-10-19_09:19:38 6100 FHEM/98_backupToStorage.pm -UPD 2020-10-19_19:31:51 15811 lib/FHEM/backupToStorage.pm +UPD 2020-10-20_15:44:56 6132 FHEM/98_backupToStorage.pm +UPD 2020-10-20_15:44:23 16005 lib/FHEM/backupToStorage.pm diff --git a/lib/FHEM/backupToStorage.pm b/lib/FHEM/backupToStorage.pm index 9ab52b0..128d686 100644 --- a/lib/FHEM/backupToStorage.pm +++ b/lib/FHEM/backupToStorage.pm @@ -336,15 +336,16 @@ sub PushToStorage { my @fileNameAtStorage_array = split( '/', $backupFile ); my $fileNameAtStorage = $fileNameAtStorage_array[$#fileNameAtStorage_array]; - $subprocess->{curl} = qx(which curl); + $subprocess->{curl} = qx(which curl); chomp($subprocess->{curl}); - $subprocess->{type} = $hash->{STORAGETYPE}; - $subprocess->{host} = AttrVal( $name, 'bTS_Host', '' ); - $subprocess->{user} = AttrVal( $name, 'bTS_User', '' ); - $subprocess->{pass} = ReadPassword( $hash, $name ); - $subprocess->{path} = AttrVal( $name, 'bTS_Path', '' ); - $subprocess->{backupfile} = $backupFile; - $subprocess->{fileNameAtStorage} = $fileNameAtStorage; + $subprocess->{type} = $hash->{STORAGETYPE}; + $subprocess->{host} = AttrVal( $name, 'bTS_Host', '' ); + $subprocess->{user} = AttrVal( $name, 'bTS_User', '' ); + $subprocess->{pass} = ReadPassword( $hash, $name ); + $subprocess->{path} = AttrVal( $name, 'bTS_Path', '' ); + $subprocess->{backupfile} = $backupFile; + $subprocess->{fileNameAtStorage} = $fileNameAtStorage; + $subprocess->{proto} = AttrVal( $name, 'bTS_Proto', 'https' ); my $pid = $subprocess->run(); @@ -441,7 +442,7 @@ sub ExecuteNCupload { $command .= ' -s -u '; $command .= $subprocess->{user} . ':' . $subprocess->{pass}; $command .= ' -T ' . $subprocess->{backupfile}; - $command .= ' "https://'; + $command .= ' "' . $subprocess->{proto} . '://'; $command .= $subprocess->{host}; $command .= '/remote.php/dav/files/'; $command .= $subprocess->{user};