Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-16 23:31:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

half way point

Browse Source
This commit is contained in:
tschettervictor
2025-04-30 11:21:41 -06:00
parent 984c4a1191
commit bb47671cf0
18 changed files with 109 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
usr/local/bin/bastille
View File

@@ -268,9 +268,6 @@ esac
# shellcheck disable=SC2154
SCRIPTPATH="${bastille_sharedir}/${CMD}.sh"
# Start with blank line
echo
if [ -f "${SCRIPTPATH}" ]; then
: "${UMASK:=022}"

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

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille bootstrap [option(s)] [RELEASE|TEMPLATE] [update|arch]"
cat << EOF
Options:
-x | --debug Enable debug mode.
@@ -288,7 +289,7 @@ bootstrap_release() {
info "Bootstrap successful."
info "See 'bastille --help' for available commands."
echo
}
debootstrap_release() {
@@ -384,7 +385,6 @@ debootstrap_release() {
info "Bootstrap successful."
info "See 'bastille --help' for available commands."
echo
}
bootstrap_template() {
@@ -658,3 +658,5 @@ case "${OPTION}" in
bastille update "${RELEASE}"
;;
esac
echo

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

@@ -33,8 +33,9 @@
. /usr/local/share/bastille/common.sh
usage() {
error_notify "Usage: bastille clone [option(s)] TARGET NEW_NAME IP_ADDRESS"
error_notify "Usage: bastille clone [option(s)] TARGET NEWNAME IPADDRESS"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required. Cannot be used with [-l|--live].
@@ -373,19 +374,22 @@ update_jailconf_vnet() {
clone_jail() {
info "Attempting to clone ${TARGET} to ${NEWNAME}..."
info "\n[${TARGET}]:"
echo "Attempting clone to ${NEWNAME}..."
if ! [ -d "${bastille_jailsdir}/${NEWNAME}" ]; then
if checkyesno bastille_zfs_enable; then
if [ "${LIVE}" -eq 1 ]; then
check_target_is_running "${TARGET}" || error_exit "[-l|--live] can only be used with a running jail."
else check_target_is_stopped "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-stopping ${TARGET}..."
bastille stop "${TARGET}"
else
error_notify "Jail is running."
error_exit "Use [-a|--auto] to force stop the jail, or [-l|--live] (ZFS only) to clone a running jail."
fi
fi
if [ -n "${bastille_zfs_zpool}" ]; then
# Replicate the existing container
DATE=$(date +%F-%H%M%S)
@@ -401,14 +405,18 @@ clone_jail() {
zfs destroy "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NEWNAME}@bastille_clone_${DATE}"
fi
else
# Perform container file copy (archive mode)
check_target_is_stopped "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-stopping ${TARGET}..."
bastille stop "${TARGET}"
else
error_notify "Jail is running."
error_exit "Use [-a|--auto] to force stop the jail."
fi
# Perform container file copy (archive mode)
cp -a "${bastille_jailsdir}/${TARGET}" "${bastille_jailsdir}/${NEWNAME}"
fi
else
error_exit "${NEWNAME} already exists."
@@ -441,4 +449,6 @@ else
usage
fi
clone_jail
clone_jail
echo

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

@@ -33,8 +33,9 @@
. /usr/local/share/bastille/common.sh
usage() {
error_notify "Usage: bastille cmd [option(s)] TARGET command"
error_notify "Usage: bastille cmd [option(s)] TARGET COMMAND"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
@@ -90,15 +91,15 @@ set_target "${TARGET}"
for _jail in ${JAILS}; do
info "\n[${_jail}]:"
check_target_is_running "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-starting ${_jail}..."
bastille start "${_jail}"
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
error_continue "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
COUNT=$(($COUNT+1))
if grep -qw "linsysfs" "${bastille_jailsdir}/${_jail}/fstab"; then
@@ -116,15 +117,13 @@ for _jail in ${JAILS}; do
else
RETURN=$(($RETURN+$ERROR_CODE))
fi
# Print blank line
echo ""
done
# Check when a command is executed in all running jails. (bastille cmd ALL ...)
if [ "${COUNT}" -gt 1 ] && [ "${RETURN}" -gt 0 ]; then
RETURN=1
return "${RETURN}"
fi
return "${RETURN}"
echo

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

@@ -72,22 +72,13 @@ error_continue() {
continue
}
# Notify message on error, and continue to next jail
# Echo blank line
error_continue_next_jail() {
error_notify "$@"
echo
# shellcheck disable=SC2104
continue
}
# Notify message on error, but do not exit
error_notify() {
echo -e "${COLOR_RED}$*${COLOR_RESET}" 1>&2
}
# Notify message on error and exit
# Echo blank line
# Echo blank line when exiting
error_exit() {
error_notify "$@"
echo
@@ -209,14 +200,15 @@ set_target() {
if get_jail_name "${_jail}" > /dev/null; then
_jail="$(get_jail_name ${_jail})"
else
error_continue_next_jail "Error: JID \"${_jail}\" not found. Is jail running?"
error_continue "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_next_jail "Jail not found \"${_jail}\""
error_continue "Jail not found \"${_jail}\""
else
echo
exit 1
fi
fi
@@ -253,6 +245,7 @@ set_target_single() {
elif [ $? -eq 2 ]; then
error_exit "Jail not found \"${_TARGET}\""
else
echo
exit 1
fi
fi

3
usr/local/share/bastille/config.sh
View File

@@ -34,8 +34,9 @@
usage() {
error_notify "Usage: bastille config TARGET [get|set|remove] PROPERTY [VALUE]"
error_notify "Usage: bastille config TARGET [get|set|remove] PROPERTY VALUE"
cat << EOF
Options:
-x | --debug Enable debug mode.

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

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille console [option(s)] TARGET [user]"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
@@ -115,15 +116,15 @@ check_fib() {
}
for _jail in ${JAILS}; do
info "\n[${_jail}]:"
check_target_is_running "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-starting ${_jail}..."
bastille start "${_jail}"
else
info "[${_jail}]:"
error_notify "Jail is not running."
error_continue_next_jail "Use [-a|--auto] to auto-start the jail."
error_continue "Use [-a|--auto] to auto-start the jail."
fi
info "[${_jail}]:"
LOGIN="$(jexec -l "${_jail}" which login)"
if [ -n "${USER}" ]; then
@@ -133,8 +134,7 @@ for _jail in ${JAILS}; do
LOGIN="$(jexec -l "${_jail}" which login)"
${_setfib} jexec -l "${_jail}" $LOGIN -f root
fi
# Print blank line
echo ""
done
echo

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

@@ -34,8 +34,8 @@
usage() {
error_notify "Usage: bastille convert [option(s)] [TARGET|TARGET RELEASE]"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
@@ -81,7 +81,11 @@ CONVERT_RELEASE="${2}"
bastille_root_check
set_target_single "${TARGET}"
info "\n[${TARGET}]:"
check_target_is_stopped "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-stopping ${TARGET}..."
bastille stop "${TARGET}"
else
error_notify "Jail is running."
@@ -103,7 +107,7 @@ convert_jail_to_release() {
_jailname="${1}"
_release="${2}"
info "Creating ${_release} from ${_jailname}..."
echo "Creating ${_release} from ${_jailname}..."
if checkyesno bastille_zfs_enable; then
if [ -n "${bastille_zfs_zpool}" ]; then
@@ -162,7 +166,7 @@ convert_symlinks() {
done
# Copy new files to destination jail
info "Copying required base files to container..."
echo "Copying required base files to container..."
for _link in ${SYMLINKS}; do
if [ ! -d "${_link}" ]; then
if [ -d "${bastille_releasesdir}/${RELEASE}/${_link}" ]; then
@@ -274,3 +278,5 @@ elif [ "$#" -eq 2 ]; then
else
usage
fi
echo

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

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille cp [option(s)] TARGET HOST_PATH JAIL_PATH"
cat << EOF
Options:
-q | --quiet Suppress output.
@@ -88,16 +89,15 @@ set_target "${TARGET}"
for _jail in ${JAILS}; do
info "[${_jail}]:"
info "\n[${_jail}]:"
host_path="${HOST_PATH}"
jail_path="$(echo ${bastille_jailsdir}/${_jail}/root/${JAIL_PATH} | sed 's#//#/#g')"
if ! cp "${OPTION}" "${host_path}" "${jail_path}"; then
error_continue_next_jail "CP failed: ${host_path} -> ${jail_path}"
error_continue "CP failed: ${host_path} -> ${jail_path}"
fi
# Print blank line
echo ""
done
done
echo

10
usr/local/share/bastille/create.sh
View File

@@ -401,7 +401,7 @@ create_jail() {
if [ -z "${THICK_JAIL}" ] && [ -z "${CLONE_JAIL}" ]; then
LINK_LIST="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/lib32 usr/libdata usr/libexec usr/sbin usr/share usr/src"
info "Creating a thinjail..."
info "\nCreating a thinjail..."
for _link in ${LINK_LIST}; do
ln -sf /.bastille/${_link} ${_link}
done
@@ -432,7 +432,7 @@ create_jail() {
if checkyesno bastille_zfs_enable; then
if [ -n "${bastille_zfs_zpool}" ]; then
if [ -n "${CLONE_JAIL}" ]; then
info "Creating a clonejail...\n"
info "\nCreating a clonejail...\n"
## clone the release base to the new basejail
SNAP_NAME="bastille-clone-$(date +%Y-%m-%d-%H%M%S)"
# shellcheck disable=SC2140
@@ -444,7 +444,7 @@ create_jail() {
# Check and apply required settings.
post_create_jail
elif [ -n "${THICK_JAIL}" ]; then
info "Creating a thickjail. This may take a while...\n"
info "\nCreating a thickjail. This may take a while...\n"
## perform release base replication
## sane bastille zfs options
@@ -971,7 +971,7 @@ if [ -z "${EMPTY_JAIL}" ]; then
validate_netconf
fi
else
info "Creating empty jail: ${NAME}."
info "\nCreating empty jail: ${NAME}."
fi
# May not exist on deployments created before Bastille 0.7.20200714, so creating it. -- cwells
@@ -1008,3 +1008,5 @@ if check_target_exists "${NAME}"; then
fi
create_jail "${NAME}" "${RELEASE}" "${IP}" "${INTERFACE}"
echo

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

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille destroy [option(s)] [JAIL|RELEASE]"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
@@ -51,16 +52,18 @@ destroy_jail() {
local OPTIONS
for _jail in ${JAILS}; do
info "[${_jail}]:"
bastille_jail_base="${bastille_jailsdir}/${_jail}"
bastille_jail_log="${bastille_logsdir}/${_jail}_console.log"
check_target_is_stopped "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-stopping ${_jail}..."
bastille stop "${_jail}"
else
info "[${_jail}]:"
error_notify "Jail is running."
error_continue_next_jail "Use [-a|--auto] to auto-stop the jail."
error_continue "Use [-a|--auto] to auto-stop the jail."
fi
if [ -d "${bastille_jail_base}" ]; then
@@ -109,9 +112,6 @@ destroy_jail() {
pfctl -a "rdr/${_jail}" -Fn
fi
fi
# Print blank line
echo ""
done
}
@@ -304,3 +304,5 @@ case "${TARGET}" in
destroy_jail "${JAILS}"
;;
esac
echo

1
usr/local/share/bastille/edit.sh
View File

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille edit [option(s)] TARGET [filename]"
cat << EOF
Options:
-x | --debug Enable debug mode.

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

@@ -32,6 +32,7 @@
usage() {
error_notify "Usage: bastille etcupdate [option(s)] [bootstrap|TARGET] [diff|resolve|update RELEASE]"
cat << EOF
Options:
-d | --dry-run Show output, but do not apply.
@@ -59,40 +60,40 @@ bootstrap_etc_release() {
bootstrap_etc_tarball() {
local _release="${1}"
if [ ! -f ${bastille_cachedir}/${_release}.tbz2 ]; then
echo "Building tarball, please wait..."
echo "\nBuilding tarball, please wait..."
if ! etcupdate build -d /tmp/etcupdate -s ${bastille_releasesdir}/${_release}/usr/src ${bastille_cachedir}/${_release}.tbz2; then
error_exit "Failed to build etcupdate tarball \"${_release}.tbz2\""
else
info "Etcupdate bootstrap complete: ${_release}"
info "\nEtcupdate bootstrap complete: ${_release}"
fi
elif [ -f ${bastille_cachedir}/${_release}.tbz2 ] && [ "${FORCE}" -eq 1 ]; then
rm -f "${bastille_cachedir}/${_release}.tbz2"
echo "Building tarball, please wait..."
if ! etcupdate build -d /tmp/etcupdate -s ${bastille_releasesdir}/${_release}/usr/src ${bastille_cachedir}/${_release}.tbz2; then
error_exit "Failed to build etcupdate tarball: ${_release}.tbz2"
error_exit "[ERROR]: Failed to build etcupdate tarball: ${_release}.tbz2"
else
info "Etcupdate bootstrap complete: ${_release}"
info "\nEtcupdate bootstrap complete: ${_release}"
fi
else
info "Etcupdate release has already been prepared for application: ${_release}"
info "\nEtcupdate release has already been prepared for application: ${_release}"
fi
}
diff_review() {
local _jail="${1}"
if [ "${DRY_RUN}" -eq 1 ]; then
warn "Warning: diff mode does not support [-d|--dryrun]"
error_exit "[ERROR]: diff mode does not support [-d|--dryrun]"
fi
info "[${_jail}]: etcupdate --diff mode"
info "\n[${_jail}]: etcupdate --diff mode"
etcupdate diff -D "${bastille_jailsdir}/${_jail}/root"
}
resolve_conflicts() {
local _jail="${1}"
if [ "${DRY_RUN}" -eq 1 ]; then
warn "Warning: resolve mode does not support [-d|--dryrun]"
error_exit "[ERROR]: resolve mode does not support [-d|--dryrun]"
fi
info "[${_jail}]: etcupdate resolve"
info "\n[${_jail}]: etcupdate resolve"
etcupdate resolve -D "${bastille_jailsdir}/${_jail}/root"
}
@@ -103,10 +104,10 @@ update_jail_etc() {
error_exit "Error: Please run \"bastille etcupdate bootstrap RELEASE\" first."
fi
if [ "${DRY_RUN}" -eq 1 ]; then
info "[${_jail}]: etcupdate update --dry-run"
info "\n[${_jail}]: etcupdate update --dry-run"
etcupdate -n -D "${bastille_jailsdir}/${_jail}/root" -t ${bastille_cachedir}/${_release}.tbz2
else
info "[${_jail}]: etcupdate update"
info "\n[${_jail}]: etcupdate update"
etcupdate -D "${bastille_jailsdir}/${_jail}/root" -t ${bastille_cachedir}/${_release}.tbz2
fi
}
@@ -194,3 +195,5 @@ while [ "$#" -gt 0 ]; do
;;
esac
done
echo

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

@@ -39,6 +39,7 @@ usage() {
# If no compression option specified, user must redirect standard output
error_notify "Usage: bastille export [option(s)] TARGET PATH"
cat << EOF
Options:
--gz Export a ZFS jail using GZIP(.gz) compressed image.
@@ -240,7 +241,7 @@ fi
create_zfs_snap() {
# Take a recursive temporary snapshot
if [ -z "${USER_EXPORT}" ]; then
info "Creating temporary ZFS snapshot for export..."
echo "Creating temporary ZFS snapshot for export..."
fi
zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${TARGET}@bastille_${TARGET}_${DATE}"
}
@@ -296,6 +297,9 @@ export_check() {
}
jail_export() {
info "\n[${_jail}]:"
# Attempt to export the container
DATE=$(date +%F-%H%M%S)
if checkyesno bastille_zfs_enable; then
@@ -387,3 +391,5 @@ if [ -n "${TARGET}" ]; then
fi
jail_export
fi
echo

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

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille htop [option(s)] TARGET"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
@@ -84,16 +85,16 @@ TARGET="${1}"
bastille_root_check
set_target_single "${TARGET}"
info "[${TARGET}]:"
check_target_is_running "${TARGET}" || if [ "${AUTO}" -eq 1 ]; then
echo "Auto-starting ${TARGET}..."
bastille start "${TARGET}"
else
info "[${TARGET}]:"
else
error_notify "Jail is not running."
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/import.sh
View File

@@ -36,8 +36,8 @@ usage() {
# Build an independent usage for the import command
# If no file/extension specified, will import from standard input
error_notify "Usage: bastille import [option(s)] FILE [RELEASE]"
cat << EOF
Options:
-f | --force Force an archive import regardless if the checksum file does not match or missing.
@@ -748,3 +748,5 @@ fi
if [ -n "${TARGET}" ]; then
jail_import
fi
echo

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

@@ -35,6 +35,7 @@
usage() {
error_notify "Usage: bastille jcp [option(s)] SOURCE_JAIL JAIL_PATH DEST_JAIL JAIL_PATH"
cat << EOF
Options:
-q | --quiet Suppress output.
@@ -94,17 +95,16 @@ for _jail in ${DEST_TARGET}; do
continue
else
info "[${_jail}]:"
info "\n[${_jail}]:"
source_path="$(echo ${bastille_jailsdir}/${SOURCE_TARGET}/root/${SOURCE_PATH} | sed 's#//#/#g')"
dest_path="$(echo ${bastille_jailsdir}/${_jail}/root/${DEST_PATH} | sed 's#//#/#g')"
if ! cp "${OPTION}" "${source_path}" "${dest_path}"; then
error_continue_next_jail "JCP failed: ${source_path} -> ${dest_path}"
error_continue "JCP failed: ${source_path} -> ${dest_path}"
fi
# Print blank line
echo
fi
done
done
echo

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

@@ -37,6 +37,7 @@ usage() {
error_notify "Usage: bastille limits [option(s)] TARGET [add OPTION VALUE|remove OPTION|clear|reset|[list|show] (active)|stats]"
echo -e "Example: bastille limits TARGET add memoryuse 1G"
cat << EOF
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
@@ -53,10 +54,10 @@ while [ "$#" -gt 0 ]; do
-h|--help|help)
usage
;;
-a|--auto)
AUTO=1
shift
;;
-a|--auto)
AUTO=1
shift
;;
-x|--debug)
enable_debug
shift