From 2d1ccf0e19574dadc13a7020f046b9091aeae812 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:14:42 +0200 Subject: [PATCH] Add DB Backup to Maintenance fix relative paths --- front/maintenance.php | 2 +- front/php/server/devices.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/front/maintenance.php b/front/maintenance.php index bf5c49ec..4ed5a0fa 100644 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -47,7 +47,7 @@ $execstring = 'ps -f -u pi | grep "nmap" 2>&1'; $pia_nmapscans = ""; exec($execstring, $pia_nmapscans); -$Pia_Archive_Path = "/home/pi/pialert/db/"; +$Pia_Archive_Path = str_replace('front', 'db', getcwd()).'/'; $Pia_Archive_count = 0; $files = glob($Pia_Archive_Path . "*.zip"); if ($files){ diff --git a/front/php/server/devices.php b/front/php/server/devices.php index c77494a8..33034757 100644 --- a/front/php/server/devices.php +++ b/front/php/server/devices.php @@ -266,15 +266,16 @@ function deleteEvents() { //------------------------------------------------------------------------------ function PiaBackupDBtoArchive() { - $file = '/home/pi/pialert/db/pialert.db'; - $newfile = '/home/pi/pialert/db/pialert.db.backup'; + // $DBFILE = '../../../db/pialert.db'; + $file = '../../../db/pialert.db'; + $newfile = '../../../db/pialert.db.backup'; if (!copy($file, $newfile)) { echo "Test Function executed not successfully"; } else { $Pia_Archive_Name = 'pialertdb_'.date("Ymd_his").'.zip'; - $Pia_Archive_Path = '/home/pi/pialert/db/'; - exec('zip -j '.$Pia_Archive_Path.$Pia_Archive_Name.' /home/pi/pialert/db/pialert.db', $output); + $Pia_Archive_Path = '../../../db/'; + exec('zip -j '.$Pia_Archive_Path.$Pia_Archive_Name.' ../../../db/pialert.db', $output); if (file_exists($Pia_Archive_Path.$Pia_Archive_Name)) { echo 'Test Function executed successfully ('.$Pia_Archive_Name.')'; } else {