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

Fix to match exact container name, add missing quotes

Browse Source
This commit is contained in:
Jose
2019-12-27 13:15:58 -04:00
parent de1590d709
commit 0c78ebae88
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,16 +54,16 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(bastille list jails) JAILS=$(bastille list jails)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(bastille list jails | grep -w "${TARGET}") JAILS=$(bastille list jails | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
## test if running ## test if running
if [ $(jls name | grep -w ${_jail}) ]; then if [ "$(jls name | awk "/^${_jail}$/")" ]; then
echo -e "${COLOR_RED}[${_jail}]: Already started.${COLOR_RESET}" echo -e "${COLOR_RED}[${_jail}]: Already started.${COLOR_RESET}"
## test if not running ## test if not running
elif [ ! $(jls name | grep -w ${_jail}) ]; then elif [ ! "$(jls name | awk "/^${_jail}$/")" ]; then
echo -e "${COLOR_GREEN}[${_jail}]:${COLOR_RESET}" echo -e "${COLOR_GREEN}[${_jail}]:${COLOR_RESET}"
jail -f "${bastille_jailsdir}/${_jail}/jail.conf" -c ${_jail} jail -f "${bastille_jailsdir}/${_jail}/jail.conf" -c ${_jail}

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

@@ -54,16 +54,16 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
## test if not running ## test if not running
if [ ! $(jls name | grep -w "${_jail}") ]; then if [ ! "$(jls name | awk "/^${_jail}$/")" ]; then
echo -e "${COLOR_RED}[${_jail}]: Not started.${COLOR_RESET}" echo -e "${COLOR_RED}[${_jail}]: Not started.${COLOR_RESET}"
## test if running ## test if running
elif [ $(jls name | grep -w "${_jail}") ]; then elif [ "$(jls name | awk "/^${_jail}$/")" ]; then
## remove ip4.addr from firewall table:jails ## remove ip4.addr from firewall table:jails
if [ ! -z "${bastille_jail_loopback}" ]; then if [ ! -z "${bastille_jail_loopback}" ]; then
pfctl -q -t jails -T delete $(jls -j ${_jail} ip4.addr) pfctl -q -t jails -T delete $(jls -j ${_jail} ip4.addr)