Mirrors/xigmanas-bastille-extension
1
0
Fork 1
mirror of https://github.com/JRGTH/xigmanas-bastille-extension.git synced 2025-12-11 01:10:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic changes and version number adjust

Browse Source
This commit is contained in:
Jose
2019-11-20 07:09:32 -04:00
parent 05e5e7ad5d
commit ffe34ddc12
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CHANGELOG
View File

@@ -3,13 +3,14 @@
====================== ======================
Version Description Version Description
1.0.9......Allow for distfiles download override. 1.0.10......Cosmetic changes and version number adjust.
1.0.8......Add option for thickjail creation if supported. 1.0.09......Allow for distfiles download override.
1.0.7......Added 12.1-RELEASE. 1.0.08......Add option for thickjail creation if supported.
1.0.6......Reload page after base release download. 1.0.07......Added 12.1-RELEASE.
1.0.5......Add missing uninstall code. 1.0.06......Reload page after base release download.
1.0.4......Remove obsolete code, delete shutdown command upon uninstall. 1.0.05......Add missing uninstall code.
1.0.3......Do not delete base releases with containers child. 1.0.04......Remove obsolete code, delete shutdown command upon uninstall.
1.0.2......Code and regex improvements. 1.0.03......Do not delete base releases with containers child.
1.0.1......Update paths and minor changes. 1.0.02......Code and regex improvements.
1.0.0......First Public Release. 1.0.01......Update paths and minor changes.
1.0.00......First Public Release.

9
gui/bastille_manager-lib.inc
View File

@@ -56,6 +56,7 @@ $default_distfiles = exec("/bin/cat {$config_path} | /usr/bin/grep 'bastille_boo
$jail_dir = "{$rootfolder}/jails"; $jail_dir = "{$rootfolder}/jails";
$image_dir = "ext/bastille/images"; $image_dir = "ext/bastille/images";
$thick_jail = exec("/usr/local/bin/bastille create | grep -wo '\[option\]'"); $thick_jail = exec("/usr/local/bin/bastille create | grep -wo '\[option\]'");
$reldir = "{$rootfolder}/releases";
// Ensure the root directory is configured. // Ensure the root directory is configured.
if ($rootfolder == "") if ($rootfolder == "")
@@ -69,6 +70,12 @@ else {
} }
if (is_file("{$rootfolder}/postinit")) unlink("{$rootfolder}/postinit"); if (is_file("{$rootfolder}/postinit")) unlink("{$rootfolder}/postinit");
// Check releases dir.
function is_dir_empty($reldir) {
if (!is_readable($reldir)) return NULL;
return (count(scandir($reldir)) == 2);
}
// Get all base releases list. // Get all base releases list.
function get_all_release_list() { function get_all_release_list() {
global $rootfolder; global $rootfolder;
@@ -90,7 +97,7 @@ function get_all_release_list() {
// Get all interface list. // Get all interface list.
function get_all_interface_list() { function get_all_interface_list() {
global $g; global $g;
exec("/bin/echo; /sbin/ifconfig -l | /usr/bin/tr -s ' ' '\n'; /bin/echo 'NONE'",$linkinfo); exec("/bin/echo; /sbin/ifconfig -l | /usr/bin/tr -s ' ' '\n'; /bin/echo 'Config'",$linkinfo);
array_shift($linkinfo); array_shift($linkinfo);
$iflist = []; $iflist = [];
foreach($linkinfo as $link): foreach($linkinfo as $link):

2
gui/bastille_manager_add.php
View File

@@ -83,7 +83,7 @@ if($_POST):
$jname = $pconfig['jailname']; $jname = $pconfig['jailname'];
$ipaddr = $pconfig['ipaddress']; $ipaddr = $pconfig['ipaddress'];
$release = $pconfig['release']; $release = $pconfig['release'];
if ($_POST['interface'] == 'NONE'): if ($_POST['interface'] == 'Config'):
$interface = ""; $interface = "";
else: else:
$interface = $pconfig['interface']; $interface = $pconfig['interface'];

11
gui/bastille_manager_tarballs.php
View File

@@ -204,11 +204,12 @@ $document->render();
<col class="area_data_settings_col_data"> <col class="area_data_settings_col_data">
</colgroup> </colgroup>
<thead> <thead>
<?php
<?php if (!is_dir_empty($reldir)):
html_titleline2(gettext('FreeBSD Base Release Installed')); html_titleline2(gettext('FreeBSD Base Release Installed'));
foreach ($sphere_array as $sphere_record): endif;
if (file_exists("{$rootfolder}/releases/{$sphere_record['relname']}/root/.profile")): foreach ($sphere_array as $sphere_record):
if (file_exists("{$reldir}/{$sphere_record['relname']}/root/.profile")):
html_text2('releases',gettext('Installed Base:'),htmlspecialchars($sphere_record['relname'])); html_text2('releases',gettext('Installed Base:'),htmlspecialchars($sphere_record['relname']));
else: else:
html_text2('releases',gettext('Unknown Base:'),htmlspecialchars($sphere_record['relname'])); html_text2('releases',gettext('Unknown Base:'),htmlspecialchars($sphere_record['relname']));

2
version
View File

@@ -1 +1 @@
1.0.9 1.0.10