Mirrors/BastilleBSD_bastille
1
0
Fork 1
mirror of https://github.com/BastilleBSD/bastille.git synced 2025-12-11 01:19:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1262 from BastilleBSD/tschettervictor-patch-1

Browse Source
This commit is contained in:
tschettervictor
2025-10-07 18:10:52 -06:00
committed by GitHub
parent f9fb17ac90 5e53903531
commit 19dd1c323e
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs/chapters/subcommands/migrate.rst
View File

@@ -1,7 +1,7 @@
migrate
=======
The ``migrate`` sub-command allows migrating the targeted jail(s) to
The ``migrate`` sub-command allows migrating the targeted jail(s) to
another remote system. See the chapter on Migration.
This sub-command supports multiple targets.
@@ -18,13 +18,15 @@ port by supplying it as in ``user@host:port``.
bastille migrate attica migrate@192.168.10.100
bastille migrate attica migrate@192.168.1.10:20022
bastille migrate --keyfile id_rsa attica migrate@192.168.1.10
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
-d | --destroy Destroy local jail after migration.
-b | --backup Retain archives on remote system.
| --doas Use 'doas' instead of 'sudo'.
-l | --live Migrate a running jail (ZFS only).
-p | --password Use password based authentication.
-x | --debug Enable debug mode.
-a | --auto Auto mode. Start/stop jail(s) if required.
-b | --backup Retain archives on remote system.
-d | --destroy Destroy local jail after migration.
| --doas Use 'doas' instead of 'sudo'.
-k | --keyfile Specify an alternative private keyfile name. Must be in '~/.ssh'
-l | --live Migrate a running jail (ZFS only).
-p | --password Use password based authentication.
-x | --debug Enable debug mode.

39
usr/local/share/bastille/migrate.sh
View File

@@ -40,16 +40,18 @@ usage() {
bastille migrate attica migrate@192.168.10.100
bastille migrate attica migrate@192.168.1.10:20022
bastille migrate --keyfile id_rsa attica migrate@192.168.1.10
Options:
-a | --auto Auto mode. Start/stop jail(s) if required.
-b | --backup Retain archives on remote system.
-d | --destroy Destroy local jail after migration.
| --doas Use 'doas' instead of 'sudo'.
-l | --live Migrate a running jail (ZFS only).
-p | --password Use password based authentication.
-x | --debug Enable debug mode.
-a | --auto Auto mode. Start/stop jail(s) if required.
-b | --backup Retain archives on remote system.
-d | --destroy Destroy local jail after migration.
| --doas Use 'doas' instead of 'sudo'.
-k | --keyfile Specify an alternative private keyfile name. Must be in '~/.ssh'
-l | --live Migrate a running jail (ZFS only).
-p | --password Use password based authentication.
-x | --debug Enable debug mode.
EOF
exit 1
@@ -60,6 +62,7 @@ AUTO=0
LIVE=0
OPT_BACKUP=0
OPT_DESTROY=0
OPT_KEYFILE=""
OPT_PASSWORD=0
OPT_SU="sudo"
while [ "$#" -gt 0 ]; do
@@ -83,6 +86,10 @@ while [ "$#" -gt 0 ]; do
OPT_SU="doas"
shift
;;
-k|--keyfile)
OPT_KEYFILE="${2}"
shift 2
;;
-l|--live)
LIVE=1
shift
@@ -333,13 +340,29 @@ fi
if [ "${OPT_PASSWORD}" -eq 1 ]; then
_opt_ssh_key=
else
_migrate_user_home="$(getent passwd ${USER} | cut -d: -f6)"
_migrate_user_ssh_key="${_migrate_user_home}/.ssh/id_rsa"
# Validate custom keyfile
if [ -n "${OPT_KEYFILE}" ]; then
if ! [ -f "${_migrate_user_home}/.ssh/${OPT_KEYFILE}" ]; then
error_exit "[ERROR]: Keyfile not found: ${_migrate_user_home}/.ssh/${OPT_KEYFILE}"
else
_migrate_user_ssh_key="${_migrate_user_home}/.ssh/${OPT_KEYFILE}"
fi
else
_migrate_user_ssh_key="find ${_migrate_user_home}/.ssh -maxdepth 1 -type f ! -name '*.pub' | grep -Eos 'id_.*'"
fi
_opt_ssh_key="-i ${_migrate_user_ssh_key}"
# Exit if no keys found
if [ -z "${_migrate_user_home}" ] || [ -z "${_migrate_user_ssh_key}" ]; then
error_exit "[ERROR]: Could not find keys for user: ${USER}"
# Exit if multiple keys
elif [ "$(echo "${_migrate_user_ssh_key}" | wc -l)" -ne 1 ]; then
error_notify "[ERROR]: Multiple ssh keys found:\n${_migrate_user_ssh_key}"
error_exit "Please use -k|--keyfile to specify one."
fi
fi