Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Backup and Restore implementation changes

Browse Source
This commit is contained in:
Jose
2019-11-21 01:28:33 -04:00
parent ffe34ddc12
commit 5f7e712b9e
5 changed files with 161 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gui/bastille_manager-lib.inc
View File

@@ -40,6 +40,7 @@ require_once 'system.inc';
// internal PHP functions rather than external shell commands.
//$rootfolder = dirname($config['rc']['postinit']['cmd'][$i]);
$application = "Bastille Manager";
$restore_name = "restore";
$confdir = "/var/etc/bastille_conf";
$cwdir = exec("/usr/bin/grep 'INSTALL_DIR=' {$confdir}/conf/bastille_config | /usr/bin/cut -d'\"' -f2");

44
gui/bastille_manager_maintenance.php
View File

@@ -41,7 +41,6 @@ require("auth.inc");
require("guiconfig.inc");
require_once("bastille_manager-lib.inc");
$application = "Bastille";
$pgtitle = array(gtext("Extensions"), "Bastille", "Maintenance");
// For legacy product versions.
@@ -87,7 +86,7 @@ if ($_POST) {
if (is_dir($confdir)) mwexec("rm -Rf {$confdir}", true);
mwexec("rm /usr/local/www/bastille_manager_gui.php && rm -R /usr/local/www/ext/bastille", true);
mwexec("{$rootfolder}/usr/local/sbin/bastille-init -t", true);
$uninstall_cmd = "echo 'y' | /usr/local/sbin/bastille-init -R";
$uninstall_cmd = "echo 'y' | /usr/local/sbin/bastille-init -U";
mwexec($uninstall_cmd, true);
if (is_link("/usr/local/share/{$prdname}")) mwexec("rm /usr/local/share/{$prdname}", true);
if (is_link("/var/cache/pkg")) mwexec("rm /var/cache/pkg", true);
@@ -137,18 +136,50 @@ if ($_POST) {
unset($retval);mwexec($cmd,$retval);
if ($retval == 0) {
$savemsg .= gtext("Extension settings saved successfully.");
exec("echo '{$date}: {$application} Extension settings saved successfully' >> {$logfile}");
exec("echo '{$date}: {$application}: Extension settings saved successfully' >> {$logfile}");
}
else {
$input_errors[] = gtext("Failed to save extension settings.");
exec("echo '{$date}: {$application} Failed to save extension settings' >> {$logfile}");
exec("echo '{$date}: {$application}: Failed to save extension settings' >> {$logfile}");
}
}
else {
$input_errors[] = gtext("Failed to save extension settings.");
exec("echo '{$date}: {$application} Failed to save extension settings' >> {$logfile}");
exec("echo '{$date}: {$application}: Failed to save extension settings' >> {$logfile}");
}
}
if (isset($_POST['restore']) && $_POST['restore']) {
// Ensure to have NO whitespace & trailing slash.
$backup_file = rtrim(trim($_POST['backup_path']),'/');
$filename_trim = exec("echo {$backup_file} | awk '{print $1}' | grep -o '[^/]*$'");
$jailname_trim = exec("echo {$backup_file} | awk '{print $1}' | grep -o '[^/]*$' | cut -d '-' -f1");
if ("{$backup_file}" == "") {
$input_errors[] = gtext("Error: backup file undefined.");
}
if (is_dir("{$jail_dir}/{$jailname_trim}")):
$input_errors[] = gtext("Container directory/dataset already exist.");
else:
if (is_file($backup_file)) {
$cmd = ("/usr/local/sbin/bastille-init -R '{$filename_trim}'");
unset($retval);mwexec($cmd,$retval);
if ($retval == 0) {
$savemsg .= gtext("Container restored successfully.");
exec("echo '{$date}: {$application}: Container restored successfully from {$filename_trim}' >> {$logfile}");
}
else {
$input_errors[] = gtext("Failed to restore container.");
exec("echo '{$date}: {$application}: Failed to restore container from {$filename_trim}' >> {$logfile}");
}
}
else {
$input_errors[] = gtext("Failed to restore container, file not found.");
exec("echo '{$date}: {$application}: Failed to restore container, file {$filename_trim} not found' >> {$logfile}");
}
endif;
}
}
function get_version_bastille() {
@@ -240,11 +271,12 @@ $(document).ready(function(){
<td class="vncellt"><?=gtext("Extension version");?></td>
<td class="vtable"><span name="getinfo_ext" id="getinfo_ext"><?=get_version_ext()?></span></td>
</tr>
<?php html_filechooser("backup_path", gtext("Backup directory"), $backup_path, gtext("Directory to store containers .tar backup archives."), $backup_path, true, 60);?>
<?php html_filechooser("backup_path", gtext("Backup directory"), $backup_path, gtext("Directory to store containers .tar backup archives, use as file chooser for restoring from file."), $backup_path, true, 60);?>
</table>
<div id="submit">
<input id="save" name="save" type="submit" class="formbtn" title="<?=gtext("Save settings");?>" value="<?=gtext("Save");?>"/>
<input name="upgrade" type="submit" class="formbtn" title="<?=gtext("Upgrade Extension and Bastille Packages");?>" value="<?=gtext("Upgrade");?>" />
<input name="restore" type="submit" class="formbtn" title="<?=gtext("Restore a container");?>" value="<?=gtext("Restore");?>" />
</div>
<div id="remarks">
<?php html_remark("note", gtext("Info"), sprintf(gtext("For general information visit the following link(s):")));?>

5
gui/bastille_manager_util.php
View File

@@ -114,15 +114,16 @@ if($_POST):
$container['jailname'] = $_POST['jailname'];
$confirm_name = $pconfig['confirmname'];
$item = $container['jailname'];
$date = (strftime('%Y-%m-%d-%H%M%S'));
$cmd = ("cd {$rootfolder}/jails && /usr/bin/tar -cf {$item}-{$date}.tar --exclude=.bastille --exclude=.template {$item} && /bin/mv {$item}-{$date}.tar {$backup_path}");
$cmd = ("/usr/local/sbin/bastille-init -B '{$item}'");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
$savemsg .= gtext("Container backup process completed successfully.");
exec("echo '{$date}: {$application}: Container backup process completed successfully for {$item}' >> {$logfile}");
//header('Location: bastille_manager_gui.php');
//exit;
else:
$errormsg .= gtext("Failed to backup container.");
exec("echo '{$date}: {$application}: Failed to backup container {$item}' >> {$logfile}");
endif;
endif;
break;