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

Jail rename to last position, prevent for null autoboot variables

Browse Source
This commit is contained in:
Jose
2020-05-10 05:06:02 -04:00
parent 90ad7895fd
commit 2de20334b9
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -3,6 +3,7 @@
======================
Version Description
1.0.51......Jail rename to last position, prevent for null autoboot variables.
1.0.50......Cosmetic changes, add misc configuration row to jail quick config.
1.0.49......Don't allow for blank fields in the jail config page.
1.0.48......Added jail name validation.

36
gui/bastille_manager_jconf.php
View File

@@ -213,18 +213,6 @@ if ($_POST):
endif;
endif;
if (isset($_POST['jname']) && $_POST['jname']):
if($jail_name_def !== $jail_name):
$cmd = "/usr/local/bin/bastille rename $jail_name_def $jail_name";
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
//$savemsg .= gtext("Jail name changed successfully.");
else:
$input_errors[] = gtext("Failed to save jail name.");
endif;
endif;
endif;
if (isset($_POST['ipv4']) && $_POST['ipv4']):
if($jail_ipv4_def !== $jail_ipv4):
$cmd = "/usr/bin/sed -i '' 's|.*ip4.addr.*=.*;| ip4.addr = $jail_ipv4;|' $jail_config";
@@ -314,7 +302,11 @@ if ($_POST):
endif;
if (isset($_POST['autostart']) && $_POST['autostart']):
$cmd = ("/usr/sbin/sysrc -f $configfile {$container}_AUTO_START=\"YES\"");
if($jail_name_def !== $jail_name):
// Remove obsolete variable.
exec("/usr/sbin/sysrc -f $configfile -qx {$jail_name_def}_AUTO_START");
endif;
$cmd = ("/usr/sbin/sysrc -f $configfile {$jail_name}_AUTO_START=\"YES\"");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
//$savemsg .= gtext("Autostart changed successfully.");
@@ -322,7 +314,11 @@ if ($_POST):
$input_errors[] = gtext("Failed to enable autostart.");
endif;
else:
$cmd = ("/usr/sbin/sysrc -f $configfile {$container}_AUTO_START=\"NO\"");
if($jail_name_def !== $jail_name):
// Remove obsolete variable.
exec("/usr/sbin/sysrc -f $configfile -qx {$jail_name_def}_AUTO_START");
endif;
$cmd = ("/usr/sbin/sysrc -f {$configfile} {$jail_name}_AUTO_START=\"NO\"");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
//$savemsg .= gtext("Autostart changed successfully.");
@@ -330,6 +326,18 @@ if ($_POST):
$input_errors[] = gtext("Failed to disable autostart.");
endif;
endif;
if (isset($_POST['jname']) && $_POST['jname']):
if($jail_name_def !== $jail_name):
$cmd = "/usr/local/bin/bastille rename $jail_name_def $jail_name";
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
//$savemsg .= gtext("Jail name changed successfully.");
else:
$input_errors[] = gtext("Failed to save jail name.");
endif;
endif;
endif;
//header("Location: bastille_manager_gui.php");
$savemsg .= gtext("Configuration has been saved successfully.");
endif;

2
version
View File

@@ -1 +1 @@
1.0.50
1.0.51