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

Switch back to official bastille repository, simplify initial help banner

Browse Source
This commit is contained in:
Jose
2020-05-20 17:51:56 -04:00
parent ffa6043881
commit 958a3eb245
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/bastille_manager_config.php
+4 -4
View File
@@ -54,12 +54,12 @@ if(!initial_install_banner()):
$errormsg = gtext('Bastille Initial Configuration.')
. ' '
. '</br>'
. gtext('Please check and configure the following ZFS options: BASTILLE_ZFS_ENABLE and BASTILLE_ZFS_ZPOOL.')
.'</br>'
. gtext('Where BASTILLE_ZFS_ENABLE can be set to "YES", and BASTILLE_ZFS_ZPOOL can be set to "tank" or even "tank/dataset1/dataset2" accordingly.')
. gtext('Please check and configure the following entries: "BASTILLE_ZFS_ENABLE" and "BASTILLE_ZFS_ZPOOL".')
.'</br>'
. gtext('After configuring or skip ZFS option:')
. ' '
. '<a href="' . 'bastille_manager_maintenance.php' . '">'
. gtext('After either configuring or skip this ZFS option, please visit this link to Enable/Disable ZFS Support on Bastille.')
. gtext('Please click here then push "Save" button.')
. '</a>';
$prerequisites_ok = false;
endif;
gui/bastille_manager_gui.php
+4 -2
View File
@@ -76,14 +76,16 @@ $jls_list = get_jail_infos();
$sphere_array = $jls_list;
if(!initial_install_banner()):
$errormsg = gtext('Bastille Initial Configuration.')
$errormsg = gtext('Bastille Initial Configuration:')
. ' '
. '<a href="' . 'bastille_manager_config.php' . '">'
. gtext('Please check and configure ZFS support option first.')
. '</a>'
. '</br>'
. gtext('Alternatively to skip this step:')
. ' '
. '<a href="' . 'bastille_manager_maintenance.php' . '">'
. gtext('To skip this step, click this link and then push Save.')
. gtext('Please click here then push "Save" button.')
. '</a>';
$prerequisites_ok = false;
endif;
gui/bastille_manager_maintenance.php
+1 -1
View File
@@ -50,7 +50,7 @@ if(!initial_install_banner()):
. gtext('Please check and configure ZFS support option first.')
. '</a>'
. '</br>'
. gtext('Or click Save to store current configuration regardless.');
. gtext('Or click the "Save" button to store the default configuration.');
$prerequisites_ok = false;
endif;