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

Ability to restore .tgz archives on ZFS, be more verbose

Browse Source
This commit is contained in:
Jose
2019-11-23 01:19:54 -04:00
parent cbd40d2d85
commit 6cbd299024
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.0.15......Ability to restore .tgz archives on ZFS, be more verbose.
1.0.14......Destroy ZFS dataset before rename. 1.0.14......Destroy ZFS dataset before rename.
1.0.13......Add ability to enable ZFS easily. 1.0.13......Add ability to enable ZFS easily.
1.0.12......Change tar archive extension. 1.0.12......Change tar archive extension.
bastille-init
+30 -3
View File
@@ -495,6 +495,7 @@ jail_backup()
if [ -d "${CWDIR}/jails/${JAIL_NAME}" ]; then if [ -d "${CWDIR}/jails/${JAIL_NAME}" ]; then
if [ "${bastille_zfs_enable}" = "YES" ]; then if [ "${bastille_zfs_enable}" = "YES" ]; then
if [ ! -z "${bastille_zfs_zpool}" ]; then if [ ! -z "${bastille_zfs_zpool}" ]; then
echo "Exporting '${JAIL_NAME}' to a compressed zfs archive..."
# Take a temp snapshot of the jail. # Take a temp snapshot of the jail.
SNAP_NAME="bastille-$(date +%Y-%m-%d-%H%M%S)" SNAP_NAME="bastille-$(date +%Y-%m-%d-%H%M%S)"
zfs snapshot -r ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${JAIL_NAME}@${SNAP_NAME} zfs snapshot -r ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${JAIL_NAME}@${SNAP_NAME}
@@ -505,12 +506,14 @@ jail_backup()
fi fi
else else
# Create backup file with tar. # Create backup file with tar.
echo "Exporting '${JAIL_NAME}' to a compressed tgz archive..."
cd ${CWDIR}/jails && tar ${EXCLUDE} -zcf ${JAIL_NAME}-${DATE}.tgz ${JAIL_NAME} && mv ${JAIL_NAME}-${DATE}.tgz ${CWDIR}/backups cd ${CWDIR}/jails && tar ${EXCLUDE} -zcf ${JAIL_NAME}-${DATE}.tgz ${JAIL_NAME} && mv ${JAIL_NAME}-${DATE}.tgz ${CWDIR}/backups
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to backup '${JAIL_NAME}' container." echo "Failed to backup '${JAIL_NAME}' container."
exit 1 exit 1
else else
echo "Exported '${JAIL_NAME}' successfully."
exit 0 exit 0
fi fi
else else
@@ -529,14 +532,37 @@ jail_restore()
ZFS_RECVPARAM=$(sysrc -f ${CWDIR}${EXTCONF} -qn ZFS_RECVPARAM) ZFS_RECVPARAM=$(sysrc -f ${CWDIR}${EXTCONF} -qn ZFS_RECVPARAM)
BACKUP_FILE="${ARG}" BACKUP_FILE="${ARG}"
NAME_TRIM=$(echo ${BACKUP_FILE} | awk '{print $1}' | grep -o '[^/]*$' | cut -d '-' -f1) NAME_TRIM=$(echo ${BACKUP_FILE} | awk '{print $1}' | grep -o '[^/]*$' | cut -d '-' -f1)
FILE_EXT=$(echo ${BACKUP_FILE} | awk '{print $1}' | grep -o '[^/]*$' | cut -d '.' -f2)
if [ -f "${CWDIR}/backups/${BACKUP_FILE}" ]; then if [ -f "${CWDIR}/backups/${BACKUP_FILE}" ]; then
if [ -d "${CWDIR}/jails" ]; then if [ -d "${CWDIR}/jails" ]; then
if [ ! -d "${CWDIR}/jails/${NAME_TRIM}" ]; then if [ ! -d "${CWDIR}/jails/${NAME_TRIM}" ]; then
if [ "${bastille_zfs_enable}" = "YES" ]; then if [ "${bastille_zfs_enable}" = "YES" ]; then
if [ ! -z "${bastille_zfs_zpool}" ]; then if [ ! -z "${bastille_zfs_zpool}" ]; then
# Restore from zfs file and mount jail/root dataset. if [ "${FILE_EXT}" = "zfs" ]; then
${ZFS_DECOMPRESS} ${CWDIR}/backups/${BACKUP_FILE} | zfs receive ${ZFS_RECVPARAM} ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM} # Restore from .zfs file and mount jail/root dataset.
zfs mount ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM}/root echo "Restoring from .zfs archive, receiving data stream..."
${ZFS_DECOMPRESS} ${CWDIR}/backups/${BACKUP_FILE} | zfs receive ${ZFS_RECVPARAM} ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM}
zfs mount ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM}/root
elif [ "${FILE_EXT}" = "tgz" ]; then
# Prepare the zfs environment and restore from existing tgz file.
echo "Restoring form .tgz archive, preparing zfs environment..."
zfs create ${bastille_zfs_options} ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM}
zfs create ${bastille_zfs_options} -o mountpoint=${bastille_jailsdir}/${NAME_TRIM}/root ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM}/root
# Extract required files to the new datasets.
echo "Extracting files from '${NAME_TRIM}' backup archive..."
tar -xf ${CWDIR}/backups/${BACKUP_FILE} --strip-components 1 -C ${CWDIR}/jails/${NAME_TRIM} ${NAME_TRIM}/fstab
tar -xf ${CWDIR}/backups/${BACKUP_FILE} --strip-components 1 -C ${CWDIR}/jails/${NAME_TRIM} ${NAME_TRIM}/jail.conf
tar -xf ${CWDIR}/backups/${BACKUP_FILE} --strip-components 2 -C ${CWDIR}/jails/${NAME_TRIM}/root ${NAME_TRIM}/root
if [ $? -ne 0 ]; then
echo "Failed to extract files from '${NAME_TRIM}' archive."
zfs destroy -r ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${NAME_TRIM}
exit 1
fi
else
echo "Unknown archive format."
exit 1
fi
fi fi
else else
# Restore from tar file. # Restore from tar file.
@@ -548,6 +574,7 @@ jail_restore()
else else
mkdir -p ${CWDIR}/jails/${NAME_TRIM}/root/.bastille mkdir -p ${CWDIR}/jails/${NAME_TRIM}/root/.bastille
mkdir -p ${CWDIR}/jails/${NAME_TRIM}/root/.template mkdir -p ${CWDIR}/jails/${NAME_TRIM}/root/.template
echo "Container '${NAME_TRIM}' restored successfully."
exit 0 exit 0
fi fi
else else
version
+1 -1
View File
@@ -1 +1 @@
1.0.14 1.0.15