From 36ecd56697ba608c80aaa93e992eff470e98c45b Mon Sep 17 00:00:00 2001 From: Manager Bot Date: Fri, 4 Nov 2022 19:25:09 +0000 Subject: [PATCH] Sync uses server db config now. --- Web/lib/MJB/Web/Task/SyncBlog.pm | 15 +++++++-------- Web/lib/MJB/Web/Task/SyncBlogMedia.pm | 12 ++++++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Web/lib/MJB/Web/Task/SyncBlog.pm b/Web/lib/MJB/Web/Task/SyncBlog.pm index 16a28fb..32ea193 100644 --- a/Web/lib/MJB/Web/Task/SyncBlog.pm +++ b/Web/lib/MJB/Web/Task/SyncBlog.pm @@ -29,18 +29,17 @@ sub run ( $job, $blog_id ) { $job->note( is_build_complete => 1 ); - my $domain = $blog->domain->name; my $servers = $job->app->db->servers; - while ( my $server = $servers->next ) { - $job->system_command( [ qw( rsync -vrLptgoD --delete -e ), 'ssh -o StrictHostKeyChecking=no', - $build_dir->child('build')->child('html')->to_string . "/", - "root@" . $server->hostname . ":/var/www/$domain/html/" ] ); + my $domain = $blog->domain->name; + my $source = $build_dir->child('build')->child('html')->to_string . "/"; + my $ssh_opt = 'ssh -o StrictHostKeyChecking=no'; + + while ( my $server = $servers->next ) { + my $dest = "root@" . $server->hostname . ":/var/www/$domain/html/"; + $job->system_command( [ qw( rsync -vrLptgoD --delete -e ), $ssh_opt, $source, $dest ]); } - #foreach my $host ( qw( root@web-west.myjekyllblog.net root@web-east.myjekyllblog.net ) ) { - # $job->system_command( [ qw( rsync -vrLptgoD --delete -e ), 'ssh -o StrictHostKeyChecking=no', $build_dir->child('build')->child('html')->to_string . "/", "$host:/var/www/$domain/html/" ] ); - #} $job->note( is_deploy_complete => 1 ); $job->finish( ); diff --git a/Web/lib/MJB/Web/Task/SyncBlogMedia.pm b/Web/lib/MJB/Web/Task/SyncBlogMedia.pm index 9e45c77..1013d01 100644 --- a/Web/lib/MJB/Web/Task/SyncBlogMedia.pm +++ b/Web/lib/MJB/Web/Task/SyncBlogMedia.pm @@ -17,10 +17,14 @@ sub run ( $job, $blog_id ) { $job->note( is_build_complete => 1 ); - my $domain = $blog->domain->name; - - foreach my $host ( qw( root@web-west.myjekyllblog.net root@web-east.myjekyllblog.net ) ) { - $job->system_command( [ qw( rsync -vrLptgoD --delete -e ), 'ssh -o StrictHostKeyChecking=no', $build_dir->child('src')->child('assets')->child('media')->to_string . "/", "$host:/var/www/$domain/html/assets/media" ] ); + my $servers = $job->app->db->servers; + my $domain = $blog->domain->name; + my $source = $build_dir->child('src')->child('assets')->child('media')->to_string . "/"; + my $ssh_opt = 'ssh -o StrictHostKeyChecking=no'; + + while ( my $server = $servers->next ) { + my $dest = "root@" . $server->hostname . ":/var/www/$domain/html/assets/media"; + $job->system_command( [ qw( rsync -vrLptgoD --delete -e ), $ssh_opt, $source, $dest ]); } $job->note( is_deploy_complete => 1 );