Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-17 07:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

adjust blank line option

Browse Source
This commit is contained in:
tschettervictor
2025-04-30 08:19:50 -06:00
parent af24e764bc
commit bef2ece965
23 changed files with 100 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
usr/local/bin/bastille
View File

@@ -70,11 +70,12 @@ bastille_perms_check() {
usage() {
cat << EOF
Bastille is an open-source system for automating deployment and management of
containerized applications on FreeBSD.
Usage:
bastille command [option(s)] TARGET [args]
bastille command [option(s)] TARGET [option(s)] ARGS
Available Commands:
bootstrap Bootstrap a FreeBSD release for container base.
@@ -266,7 +267,12 @@ esac
# shellcheck disable=SC2154
SCRIPTPATH="${bastille_sharedir}/${CMD}.sh"
# Start with blank line
echo
if [ -f "${SCRIPTPATH}" ]; then
: "${UMASK:=022}"
umask "${UMASK}"
@@ -279,5 +285,7 @@ if [ -f "${SCRIPTPATH}" ]; then
fi
else
error_exit "${SCRIPTPATH} not found."
fi

2
usr/local/share/bastille/cmd.sh
View File

@@ -95,7 +95,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"

19
usr/local/share/bastille/common.sh
View File

@@ -64,10 +64,19 @@ if [ -z "${NO_COLOR}" ] && [ -t 1 ]; then
enable_color
fi
# Notify message on error, and continue to next jail
# Notify message on error
# Do not echo blank line
error_continue() {
error_notify "$@"
echo ""
# shellcheck disable=SC2104
continue
}
# Notify message on error, and continue to next jail
# Echo blank line
error_continue_next_jail() {
error_notify "$@"
echo
# shellcheck disable=SC2104
continue
}
@@ -78,8 +87,10 @@ error_notify() {
}
# Notify message on error and exit
# Echo blank line
error_exit() {
error_notify "$@"
echo
exit 1
}
@@ -188,13 +199,13 @@ set_target() {
if get_jail_name "${_jail}" > /dev/null; then
_jail="$(get_jail_name ${_jail})"
else
error_continue "Error: JID \"${_jail}\" not found. Is jail running?"
error_continue_next_jail "Error: JID \"${_jail}\" not found. Is jail running?"
fi
elif ! check_target_exists "${_jail}"; then
if jail_autocomplete "${_jail}" > /dev/null; then
_jail="$(jail_autocomplete ${_jail})"
elif [ $? -eq 2 ]; then
error_continue "Jail not found \"${_jail}\""
error_continue_next_jail "Jail not found \"${_jail}\""
else
exit 1
fi

2
usr/local/share/bastille/console.sh
View File

@@ -120,7 +120,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"

2
usr/local/share/bastille/cp.sh
View File

@@ -94,7 +94,7 @@ for _jail in ${JAILS}; do
jail_path="$(echo ${bastille_jailsdir}/${_jail}/root/${JAIL_PATH} | sed 's#//#/#g')"
if ! cp "${OPTION}" "${host_path}" "${jail_path}"; then
error_continue "CP failed: ${host_path} -> ${jail_path}"
error_continue_next_jail "CP failed: ${host_path} -> ${jail_path}"
fi
# Print blank line

6
usr/local/share/bastille/destroy.sh
View File

@@ -60,7 +60,7 @@ destroy_jail() {
else
info "[${_jail}]:"
error_notify "Jail is running."
error_continue "Use [-a|--auto] to auto-stop the jail."
error_continue_next_jail "Use [-a|--auto] to auto-stop the jail."
fi
if [ -d "${bastille_jail_base}" ]; then
@@ -68,7 +68,7 @@ destroy_jail() {
mount_points="$(mount | cut -d ' ' -f 3 | grep ${bastille_jail_base}/root/)"
if [ -n "${mount_points}" ]; then
error_notify "Failed to destroy jail: ${_jail}"
error_continue "Jail has mounted filesystems:\n$mount_points"
error_continue_next_jail "Jail has mounted filesystems:\n$mount_points"
fi
info "Deleting Jail: ${_jail}."
if checkyesno bastille_zfs_enable; then
@@ -82,7 +82,7 @@ destroy_jail() {
# This will deal with the common "cannot unmount 'XYZ': pool or dataset is busy"
# unless the force option is defined by the user, otherwise will have a partially deleted jail.
if ! zfs destroy "${OPTIONS}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"; then
error_continue "[ERROR]: Jail dataset(s) appears to be busy, exiting."
error_continue_next_jail "[ERROR]: Jail dataset(s) appears to be busy, exiting."
fi
fi
fi

9
usr/local/share/bastille/htop.sh
View File

@@ -84,15 +84,16 @@ TARGET="${1}"
bastille_root_check
set_target_single "${TARGET}"
info "[${TARGET}]:"
check_target_is_running "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
bastille start "${TARGET}"
else
else
info "[${TARGET}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${TARGET}]:"
if [ ! -x "${bastille_jailsdir}/${TARGET}/root/usr/local/bin/htop" ]; then
error_notify "htop not found on ${TARGET}."
elif [ -x "${bastille_jailsdir}/${TARGET}/root/usr/local/bin/htop" ]; then

4
usr/local/share/bastille/jcp.sh
View File

@@ -100,11 +100,11 @@ for _jail in ${DEST_TARGET}; do
dest_path="$(echo ${bastille_jailsdir}/${_jail}/root/${DEST_PATH} | sed 's#//#/#g')"
if ! cp "${OPTION}" "${source_path}" "${dest_path}"; then
error_continue "JCP failed: ${source_path} -> ${dest_path}"
error_continue_next_jail "JCP failed: ${source_path} -> ${dest_path}"
fi
# Print blank line
echo ""
echo
fi
done

8
usr/local/share/bastille/limits.sh
View File

@@ -107,7 +107,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -184,12 +184,12 @@ for _jail in ${JAILS}; do
rm -f "${bastille_jailsdir}/${_jail}/rctl.conf"
info "[${TARGET}]: rctl.conf removed."
else
error_continue "[${TARGET}]: rctl.conf not found."
error_continue_next_jail "[${TARGET}]: rctl.conf not found."
fi
;;
esac
# Print blank line on last jail
[ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
# Print blank line
echo
done

18
usr/local/share/bastille/mount.sh
View File

@@ -147,7 +147,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_exit "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -167,13 +167,13 @@ for _jail in ${JAILS}; do
# Create mount point if it does not exist
if [ -d "${_hostpath}" ] && [ ! -d "${_fullpath}" ]; then
mkdir -p "${_fullpath}" || error_continue "Failed to create mount point."
mkdir -p "${_fullpath}" || error_continue_next_jail "Failed to create mount point."
elif [ -f "${_hostpath}" ] ; then
_filename="$( basename ${_hostpath} )"
if echo "${_fullpath}" 2>/dev/null | grep -qow "${_filename}"; then
mkdir -p "$( dirname "${_fullpath}" )" || error_continue "Failed to create mount point."
mkdir -p "$( dirname "${_fullpath}" )" || error_continue_next_jail "Failed to create mount point."
if [ ! -f "${_fullpath}" ]; then
touch "${_fullpath}" || error_continue "Failed to create mount point."
touch "${_fullpath}" || error_continue_next_jail "Failed to create mount point."
else
error_notify "Failed. File exists at mount point."
warn "${_fullpath}"
@@ -183,9 +183,9 @@ for _jail in ${JAILS}; do
_fullpath_fstab="$( echo "${bastille_jailsdir}/${_jail}/root/${_jailpath_fstab}/${_filename}" 2>/dev/null | sed 's#//#/#' )"
_fullpath="$( echo "${bastille_jailsdir}/${_jail}/root/${_jailpath}/${_filename}" 2>/dev/null | sed 's#//#/#' )"
_fstab_entry="${_hostpath_fstab} ${_fullpath_fstab} ${_type} ${_perms} ${_checks}"
mkdir -p "$( dirname "${_fullpath}" )" || error_continue "Failed to create mount point."
mkdir -p "$( dirname "${_fullpath}" )" || error_continue_next_jail "Failed to create mount point."
if [ ! -f "${_fullpath}" ]; then
touch "${_fullpath}" || error_continue "Failed to create mount point."
touch "${_fullpath}" || error_continue_next_jail "Failed to create mount point."
else
error_notify "Failed. File exists at mount point."
warn "${_fullpath}"
@@ -195,11 +195,11 @@ for _jail in ${JAILS}; do
fi
# Add entry to fstab and mount
echo "${_fstab_entry}" >> "${bastille_jailsdir}/${_jail}/fstab" || error_continue "Failed to create fstab entry: ${_fstab_entry}"
mount -F "${bastille_jailsdir}/${_jail}/fstab" -a || error_continue "Failed to mount volume: ${_fullpath}"
echo "${_fstab_entry}" >> "${bastille_jailsdir}/${_jail}/fstab" || error_continue_next_jail "Failed to create fstab entry: ${_fstab_entry}"
mount -F "${bastille_jailsdir}/${_jail}/fstab" -a || error_continue_next_jail "Failed to mount volume: ${_fullpath}"
echo "Added: ${_fstab_entry}"
# Print blank line
echo ""
echo
done

4
usr/local/share/bastille/network.sh
View File

@@ -448,13 +448,13 @@ remove_interface() {
if [ -n "${_if_vnet}" ] && echo ${_if_vnet} 2>/dev/null | grep -Eoq 'vnet[0-9]+'; then
sed -i '' "/.*${_if_vnet}.*/d" "${_jail_rc_config}"
else
error_continue "Failed to remove interface from /etc/rc.conf"
error_exit "Failed to remove interface from /etc/rc.conf"
fi
elif [ "${_if_type}" = "passthrough" ]; then
if [ -n "${_if_vnet}" ]; then
sed -i '' "/.*${_if_vnet}.*/d" "${_jail_rc_config}"
else
error_continue "Failed to remove interface from /etc/rc.conf"
error_exit "Failed to remove interface from /etc/rc.conf"
fi
fi

4
usr/local/share/bastille/pkg.sh
View File

@@ -101,7 +101,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -126,7 +126,7 @@ for _jail in ${JAILS}; do
fi
# Print blank line
echo ""
echo
done

4
usr/local/share/bastille/service.sh
View File

@@ -92,7 +92,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -100,6 +100,6 @@ for _jail in ${JAILS}; do
jexec -l "${_jail}" /usr/sbin/service "$@"
# Print blank line
echo ""
echo
done

13
usr/local/share/bastille/start.sh
View File

@@ -111,10 +111,13 @@ for _jail in ${JAILS}; do
fi
fi
if check_target_is_running "${_jail}"; then
info "[${_jail}]:"
error_continue_next_jail "Jail is already running."
fi
info "[${_jail}]:"
check_target_is_stopped "${_jail}" || error_continue "Jail is already running."
# Validate interfaces and add IPs to firewall table
if [ "$(bastille config ${_jail} get vnet)" != 'enabled' ]; then
_ip4_interfaces="$(bastille config ${_jail} get ip4.addr | sed 's/,/ /g')"
@@ -138,7 +141,7 @@ for _jail in ${JAILS}; do
pfctl -q -t "${bastille_network_pf_table}" -T add "${_ip}"
fi
else
error_continue "Error: ${_if} interface does not exist."
error_continue_next_jail "Error: ${_if} interface does not exist."
fi
done
fi
@@ -161,7 +164,7 @@ for _jail in ${JAILS}; do
pfctl -q -t "${bastille_network_pf_table}" -T add "${_ip}"
fi
else
error_continue "Error: ${_if} interface does not exist."
error_continue_next_jail "Error: ${_if} interface does not exist."
fi
done
fi
@@ -188,6 +191,6 @@ for _jail in ${JAILS}; do
sleep "${DELAY_TIME}"
# Print blank line
echo ""
echo
done

9
usr/local/share/bastille/stop.sh
View File

@@ -86,10 +86,13 @@ set_target "${TARGET}" "reverse"
for _jail in ${JAILS}; do
if check_target_is_stopped "${_jail}"; then
info "[${_jail}]:"
error_continue_next_jail "Jail is already stopped."
fi
info "[${_jail}]:"
check_target_is_running "${_jail}" || error_continue "Jail is already stopped."
# Remove RDR rules
if [ "$(bastille config ${_jail} get vnet)" != "enabled" ] && [ -f "${bastille_pf_conf}" ]; then
_ip4="$(bastille config ${_jail} get ip4.addr | sed 's/,/ /g')"
@@ -134,6 +137,6 @@ for _jail in ${JAILS}; do
fi
# Print blank line
echo ""
echo
done

4
usr/local/share/bastille/sysrc.sh
View File

@@ -92,7 +92,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -100,6 +100,6 @@ for _jail in ${JAILS}; do
jexec -l "${_jail}" /usr/sbin/sysrc "$@"
# Print blank line
echo ""
echo
done

2
usr/local/share/bastille/tags.sh
View File

@@ -118,7 +118,7 @@ for _jail in ${JAILS}; do
esac
# Print blank line
echo ""
echo
done

4
usr/local/share/bastille/template.sh
View File

@@ -275,7 +275,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -471,7 +471,7 @@ for _jail in ${JAILS}; do
done
# Print blank line
echo ""
echo
info "Template applied: ${TEMPLATE}"

2
usr/local/share/bastille/top.sh
View File

@@ -90,7 +90,7 @@ check_target_is_running "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
bastille start "${TARGET}"
else
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_exit "Use [-a|--auto] to auto-start the jail."
fi
jexec -l "${TARGET}" /usr/bin/top

12
usr/local/share/bastille/umount.sh
View File

@@ -92,7 +92,7 @@ for _jail in ${JAILS}; do
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_exit "Use [-a|--auto] to auto-start the jail."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
@@ -104,29 +104,29 @@ for _jail in ${JAILS}; do
# Exit if mount point non-existent
if [ -z "${_mount}" ] && [ -z "${_fstab_entry}" ]; then
error_continue "The specified mount point does not exist."
error_continue_next_jail "The specified mount point does not exist."
fi
# Unmount
if [ -n "${_mount}" ]; then
umount "${_jailpath}" || error_continue "Failed to unmount volume: ${MOUNT_PATH}"
umount "${_jailpath}" || error_continue_next_jail "Failed to unmount volume: ${MOUNT_PATH}"
fi
# Remove entry from fstab
if [ -n "${_fstab_entry}" ]; then
if ! sed -E -i '' "\, +${_jailpath_fstab} +,d" "${bastille_jailsdir}/${_jail}/fstab"; then
error_continue "Failed to delete fstab entry: ${MOUNT_PATH}"
error_continue_next_jail "Failed to delete fstab entry: ${MOUNT_PATH}"
fi
fi
# Delete if mount point was a file
if [ -f "${_jailpath}" ]; then
rm -f "${_jailpath}" || error_continue "Failed to unmount volume: ${MOUNT_PATH}"
rm -f "${_jailpath}" || error_continue_next_jail "Failed to unmount volume: ${MOUNT_PATH}"
fi
echo "Unmounted: ${_jailpath}"
# Print blank line
echo ""
echo
done

6
usr/local/share/bastille/update.sh
View File

@@ -111,11 +111,13 @@ jail_check() {
set_target_single "${TARGET}"
check_target_is_running "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
bastille start "${TARGET}"
else
else
info "[${TARGET}]:"
error_notify "Jail is not running."
error_continue "Use [-a|--auto] to auto-start the jail."
error_exit "Use [-a|--auto] to auto-start the jail."
fi
if grep -qw "${bastille_jailsdir}/${TARGET}/root/.bastille" "${bastille_jailsdir}/${TARGET}/fstab"; then
info "[${TARGET}]:"
error_notify "${TARGET} is not a thick container."
error_exit "See 'bastille update RELEASE' to update thin jails."
fi

6
usr/local/share/bastille/upgrade.sh
View File

@@ -107,7 +107,8 @@ thick_jail_check() {
# Check if the jail is thick and is running
check_target_is_running "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
bastille start "${_jail}"
else
else
info "[${TARGET}]:"
error_notify "Jail is not running."
error_exit "Use [-a|--auto] to auto-start the jail."
fi
@@ -118,7 +119,8 @@ thin_jail_check() {
# Check if the jail is thick and is running
check_target_is_stopped "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
bastille stop "${_jail}"
else
else
info "[${TARGET}]:"
error_notify "Jail is running."
error_exit "Use [-a|--auto] to auto-stop the jail."
fi

25
usr/local/share/bastille/zfs.sh
View File

@@ -46,14 +46,13 @@ EOF
zfs_snapshot() {
for _jail in ${JAILS}; do
echo ""
info "[${_jail}]:"
# shellcheck disable=SC2140
zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
# Print blank line on last jail
[ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
# Print blank line
echo
done
}
@@ -61,14 +60,13 @@ done
zfs_destroy_snapshot() {
for _jail in ${JAILS}; do
echo ""
info "[${_jail}]:"
# shellcheck disable=SC2140
zfs destroy -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
# Print blank line on last jail
[ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
# Print blank line
echo
done
}
@@ -76,13 +74,12 @@ done
zfs_set_value() {
for _jail in ${JAILS}; do
echo ""
info "[${_jail}]:"
zfs "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail
[ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
# Print blank line
echo
done
}
@@ -90,12 +87,11 @@ done
zfs_get_value() {
for _jail in ${JAILS}; do
echo ""
info "[${_jail}]:"
zfs get "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail
[ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
# Print blank line
echo
done
}
@@ -103,13 +99,12 @@ done
zfs_disk_usage() {
for _jail in ${JAILS}; do
echo ""
info "[${_jail}]:"
zfs list -t all -o name,used,avail,refer,mountpoint,compress,ratio -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail
[ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
# Print blank line
echo
done
}