Switch back to official bastille repository, simplify initial help banner

CHANGELOG

@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.64......Switch back to official bastille repository, simplify initial help banner.
 1.0.63......Always apply required updates after platform check.
 1.0.62......Check/apply required updates to bastille while checking for upgrades.
 1.0.61......Display static inet ip from vnet jail config.

bastille-init

@@ -66,6 +66,7 @@ EXTCONFLINK="/var/etc/${APPNAME}_conf"
 BASTILLERCD="/usr/local/etc/rc.d/${APPNAME}"
 BASTILLEPATH="${USRLOCAL}/bin"
 BASTILLECONF="${USRLOCAL}/etc/${APPNAME}/${APPNAME}.conf"
+BASTILLECONFFILE="/conf/bastille_conf"
 BASTILLECONFLINK="/var/etc/bastille_conf"
 BASTILLECONF_EXT="${CWDIR}/conf/bastille.conf.ext"
 INCLUDE_PATH="${CWDIR}/conf/system"
@@ -73,8 +74,8 @@ FREEBSD_UPDATE="${INCLUDE_PATH}/freebsd-update/${HOSTVERSION}"
 SYSTEM_INCLUDE="${INCLUDE_PATH}/include/${HOSTVERSION}"
 INSTALLPATH="${CWDIR}/${FULLAPPNAME}"
 BRANCH="master"
-#BATSILLE_URL="https://github.com/BastilleBSD/${APPNAME}/archive/${BRANCH}.zip" # Official Bastille Repository)
+BATSILLE_URL="https://github.com/BastilleBSD/${APPNAME}/archive/${BRANCH}.zip" # Official Bastille Repository)
-BATSILLE_URL="https://github.com/JRGTH/${APPNAME}/archive/${BRANCH}.zip" # Alternate Bastille Repository, early updates)
+BATSILLE_ALT="https://github.com/JRGTH/${APPNAME}/archive/${BRANCH}.zip" # Alternate Bastille Repository, early updates)
 BASTILE_VERSION="https://raw.githubusercontent.com/BastilleBSD/${APPNAME}/${BRANCH}/usr/local/bin/${APPNAME}"
 GITURL="https://github.com/JRGTH/xigmanas-${APPNAME}-extension/archive/${BRANCH}.zip"
 VERFILE="https://raw.githubusercontent.com/JRGTH/xigmanas-${APPNAME}-extension/${BRANCH}/version"
@@ -106,7 +107,7 @@ runtime_config()
 		fi
 	fi
 
-	# Check for directories.
+	# Check for required directories and files.
 	if [ ! -d "${CWDIR}/backups" ]; then
 		mkdir -p ${CWDIR}/backups
 	fi
@@ -122,6 +123,9 @@ runtime_config()
 	if [ ! -d "${CWDIR}/freebsd-update" ]; then
 		mkdir ${CWDIR}/freebsd-update
 	fi
+	if [ ! -f "${CWDIR}${BASTILLECONFFILE}" ]; then
+		touch ${CWDIR}${BASTILLECONFFILE}
+	fi
 
 	# Check for permissions.
 	if [ -f "${FREEBSD_UPDATE}/freebsd-update" ]; then
@@ -392,7 +396,8 @@ include_files()
 
 required_updates()
 {
-	# Check for required updates and bug fixes.
+	# Check for critical and/or required updates and bug fixes and apply them.
+	# This is because not always the bastille version is increased on updates and/or bug fixes.
 	if [ -f "${INSTALLPATH}${USRLOCAL}/share/${APPNAME}/rename.sh" ]; then
 		if ! grep -qwE '{ZFS_DATASET_ORIGIN}(.*){ZFS_DATASET_TARGET}' ${INSTALLPATH}${USRLOCAL}/share/${APPNAME}/rename.sh; then
 			echo "Required update found, performing update..."

gui/bastille_manager_config.php

@@ -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.')
+			. gtext('Please check and configure the following entries: "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.')
 			.'</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

@@ -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

@@ -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;
 

version

@@ -1 +1 @@
-1.0.63
+1.0.64