From 1c93be6e8a08a15168ab4c75cc9d77919c9a49c4 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Wed, 26 Feb 2025 11:57:22 +0000
Subject: [PATCH] * Tue Feb 25 2025 Brian Read <brianr@koozali.org>
 11.0.0-58.sme - re-organise open db placement [SME: 12695] - Re-arrange
 parameters to tar to avoid warning message in logs [SME: 12943]

---
 .../smanager/lib/SrvMngr/Controller/Backup.pm |  8 ++-
 .../themes/default/templates/backdown.html.ep | 56 +++++++++++--------
 smeserver-manager.spec                        |  6 +-
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
index ba1dfec..e725857 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
@@ -135,7 +135,11 @@ sub do_display {
         $c->stash(compressionlevel => $CompressionLevel, exclude => \@exclude, directories => \@directories);
 
         # streaming download in template
-        return $c->render("/backdown");
+        $c->render(template=>"backdown");
+        #sleep(30);
+        # Redirect to the front page
+		#$c->redirect_to('/backup');
+        return ""
     } ## end if ($function eq 'desktop_backup')
 
     if ($function eq 'tape_configure') {
@@ -2020,4 +2024,4 @@ sub vmount {
         return (qx(/bin/mount -t nfs -o nolock,timeo=30,retrans=1,retry=0 "$host:/$share" $mountdir 2>&1));
     }
 } ## end sub vmount
-1;
+1;
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/backdown.html.ep b/root/usr/share/smanager/themes/default/templates/backdown.html.ep
index 2e9f6ca..b8bbd85 100644
--- a/root/usr/share/smanager/themes/default/templates/backdown.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/backdown.html.ep
@@ -19,29 +19,38 @@
     my $cmd = "/bin/tar --create --file=- --directory / @{$c->stash('exclude')}  "
         . "@{$c->stash('directories')} | /usr/bin/gzip $clvl ";
 
-    #die("$cmd");
-
     my $success = open my $fh, '-|', $cmd;
-    unless ($success) { return "Error dowload command."; };
- 
-  # Write chunk
-  $c->res->headers->content_type('application/x-tar');
-  $c->res->headers->content_disposition(qq/attachment; filename="smeserver.tgz"/);
-
-  my $cb;
-  $cb = sub {
-    my $c = shift;
-    my $size = 500 * 1024;
-    my $length = sysread($fh, my $buffer, $size);
-    unless ($length) {
-      close $fh;
-      undef $cb;
-      $c->finish;
-      return;
-    }
-    $c->write_chunk($buffer, $cb);
-  };
-  $c->$cb;
+    #unless ($success) { return "Error download command."; };
+    if ($success) {
+		# Try with download plugin - seems to fail to complete download and also 
+		# name of file deposited is not as required.
+		#my $output = do { local $/; <$fh> };
+		#close $fh;
+		#$c->render_file(
+			#data => $output,
+			#filename => 'output.txt',
+			#content_type => 'text/plain'
+		#);
+		# So organise it ourselves.
+		$c->res->headers->content_type('application/x-tar');
+		$c->res->headers->content_disposition(qq/attachment; filename="smeserver.tgz"/);
+		my $cb;
+		$cb = sub {
+		my $c = shift;
+		my $size = 500 * 1024;
+		my $length = sysread($fh, my $buffer, $size);
+		unless ($length) {
+		  close $fh;
+		  undef $cb;
+		  $c->finish;
+		  return;
+		}
+		$c->write_chunk($buffer, $cb);
+		};
+		$c->$cb;
+	} else {
+		$c->render(text => "Failed to execute command: $!", status => 500);
+	}
 
     # Remove the dumped tables.
     $status = system("/sbin/e-smith/signal-event", "post-backup", "desktop");
@@ -54,4 +63,5 @@
     $backup_rec->set_prop('EndEpochTime', "$now");
     $backup_rec->set_prop('Result', "0");
 
-%>
\ No newline at end of file
+%>
+1;
\ No newline at end of file
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index 3a0889c..c475d76 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 57
+%define release 58
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -143,6 +143,10 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Tue Feb 25 2025 Brian Read <brianr@koozali.org> 11.0.0-58.sme
+- re-organise open db placement [SME: 12695]
+- Re-arrange parameters to tar to avoid warning message in logs [SME: 12943]
+
 * Fri Feb 21 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-57.sme
 - upgrade validate_password sub to use esmith::util [SME: 12937]
   and deduplicate code