From 6a082113d64cdec44e1545445a8fe228c64964c0 Mon Sep 17 00:00:00 2001 From: Christer Edwards Date: Sat, 22 Jun 2019 14:15:20 -0600 Subject: [PATCH] new zfs sub-command and documentation --- README.md | 22 ++++++++ usr/local/bin/bastille | 4 +- usr/local/share/bastille/zfs.sh | 89 +++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 usr/local/share/bastille/zfs.sh diff --git a/README.md b/README.md index d1ba606b..ea091962 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Available Commands: top Display and update information about the top(1) cpu processes. update Update jail base -pX release. upgrade Upgrade jail release to X.Y-RELEASE. + zfs Manage (get|set) zfs attributes on targeted jail(s). Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. @@ -758,6 +759,27 @@ If you see errors or issues here, consider deleting and re-bootstrapping the release. +bastille zfs +------------ +This sub-command allows managing zfs attributes for the targeted jail(s). +Common usage includes setting jail quotas. + +** set quota ** +```shell +ishmael ~ # bastille zfs folsom 'set quota=1G' +``` + +** built-in: df ** +```shell +ishmael ~ # bastille zfs ALL df +``` + +** built-in: df ** +```shell +ishmael ~ # bastille zfs folsom df +``` + + Example (create, start, console) ================================ This example creates, starts and consoles into the jail. diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index da945e6b..eb959d92 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -32,7 +32,7 @@ . /usr/local/etc/bastille/bastille.conf ## version -BASTILLE_VERSION="0.3.20190204" +BASTILLE_VERSION="0.3.20190622" usage() { cat << EOF @@ -93,7 +93,7 @@ update|upgrade) ;; console|bootstrap|htop|top) ;; -bootstrap|update|upgrade) +bootstrap|update|upgrade|zfs) ;; *) usage diff --git a/usr/local/share/bastille/zfs.sh b/usr/local/share/bastille/zfs.sh new file mode 100644 index 00000000..0b2811d9 --- /dev/null +++ b/usr/local/share/bastille/zfs.sh @@ -0,0 +1,89 @@ +#!/bin/sh +# +# Copyright (c) 2018-2019, Christer Edwards +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +. /usr/local/share/bastille/colors.pre.sh +. /usr/local/etc/bastille/bastille.conf + +usage() { + echo -e "${COLOR_RED}Usage: bastille zfs [ALL|glob] '[set|get] key=value'${COLOR_RESET}" + exit 1 +} + +# Handle special-case commands first. +case "$1" in +help|-h|--help) + usage + ;; +esac + +## check ZFS enabled +if [ ! "${bastille_zfs_enable}" = "YES" ]; then + echo -e "${COLOR_RED}ZFS not enabled.'${COLOR_RESET}" + exit 1 +fi + +## check zpool defined +if [ -z "${bastille_zfs_zpool}" ]; then + echo -e "${COLOR_RED}ZFS zpool not defined.'${COLOR_RESET}" + exit 1 +fi + +if [ $# -gt 2 ] || [ $# -lt 2 ]; then + usage +fi + +if [ "$1" = 'ALL' ]; then + JAILS=$(jls name) +fi +if [ "$1" != 'ALL' ]; then + JAILS=$(jls name | grep -E "(^|\b)${1}($|\b)") +fi + +if [ "$1" = 'ALL' ]; then + if [ "$2" = 'df' ]; then + zfs list -o name,used,avail,refer,mountpoint,quota,ratio -r ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails + fi +fi + +if [ "$1" != 'ALL' ]; then + if [ "$2" = 'df' ]; then + for _jail in ${JAILS}; do + zfs list -o name,used,avail,refer,mountpoint,quota,ratio -r ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail} + done + fi +fi + +if [ "$2" != 'df' ]; then + for _jail in ${JAILS}; do + echo -e "${COLOR_GREEN}[${_jail}]:${COLOR_RESET}" + zfs $2 ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail} + echo + done +fi