From: Vincent Vanwaelscappel Date: Tue, 17 Sep 2024 10:38:56 +0000 (+0200) Subject: wait #7085 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=47856640220246bb221013dab96ae6c1b7e16f2e;p=fluidbook-toolbox.git wait #7085 @1 --- diff --git a/app/Http/Controllers/Admin/Operations/Tools/StaticSiteUploader.php b/app/Http/Controllers/Admin/Operations/Tools/StaticSiteUploader.php index 4d63e4f2a..107f62a39 100644 --- a/app/Http/Controllers/Admin/Operations/Tools/StaticSiteUploader.php +++ b/app/Http/Controllers/Admin/Operations/Tools/StaticSiteUploader.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin\Operations\Tools; use Cubist\Backpack\Magic\Fields\SelectFromArray; use Cubist\Backpack\Magic\Fields\StandardFile; use Cubist\Backpack\Magic\Form; +use Cubist\Net\Transfer\SFTP; use Cubist\Util\CommandLine\Rsync; use Cubist\Util\Files\Files; use Cubist\Util\Zip; @@ -15,7 +16,20 @@ trait StaticSiteUploader public static function getSites() { return [ - 'cubedesigners-v8' => ['id' => 'cubedesigners-v8', 'label' => __('Cubedesigners V8'), 'server' => 'cloudatlas.cubedesigners.com', 'url' => 'https://v8.cubedesigners.com/'] + 'cubedesigners-v8' => ['id' => 'cubedesigners-v8', + 'label' => __('Cubedesigners V8'), + 'server' => 'cloudatlas.cubedesigners.com', + 'user' => 'staticupload', + 'password' => '', + 'path' => '/home/staticupload/cubedesigners-v8', + 'url' => 'https://v8.cubedesigners.com/'], + 'caumes-armatures' => ['id' => 'caumes-armatures', + 'label' => __('Caumes Armatures'), + 'server' => 'ssh.cluster006.ovh.net', + 'user' => 'caumesar', + 'password' => 'e5I4Gtt7hx', + 'path' => '/home/caumesar/', + 'url' => 'https://www.caumesarmatures.fr'] ]; } @@ -65,9 +79,7 @@ trait StaticSiteUploader $site = static::getSites()[$site]; } - $dest = 'staticupload@' . $site['server'] . ':/home/staticupload/' . $site['id'] . rtrim('/' . ltrim($path, '/'), '/'); - $rsync = new Rsync($from, $dest); - $rsync->setMirror(true); - $rsync->execute(); + $transfer = SFTP::getInstance($site['server'], $site['user'], $site['password'], $site['path'], $site['port'] ?? 22); + $transfer->copy($from, $path, false); } }