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

Merge pull request #141 from cedwards/fixes

Browse Source 
Few fixes
This commit is contained in:
Christer Edwards
2020-02-04 14:54:10 -07:00
committed by GitHub
parent 70eb3e6aa2 11d7524446
commit 9a1b673721
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,7 @@ validate_ip() {
echo -e "${COLOR_YELLOW}Warning: ip address already in use ($ip).${COLOR_RESET}" echo -e "${COLOR_YELLOW}Warning: ip address already in use ($ip).${COLOR_RESET}"
else else
echo -e "${COLOR_GREEN}Valid: ($ip).${COLOR_RESET}" echo -e "${COLOR_GREEN}Valid: ($ip).${COLOR_RESET}"
fi
else else
echo -e "${COLOR_RED}Invalid: ($ip).${COLOR_RESET}" echo -e "${COLOR_RED}Invalid: ($ip).${COLOR_RESET}"
exit 1 exit 1

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

@@ -64,13 +64,17 @@ for _jail in ${JAILS}; do
## test if not running ## test if not running
elif [ ! "$(jls name | awk "/^${_jail}$/")" ]; then elif [ ! "$(jls name | awk "/^${_jail}$/")" ]; then
echo -e "${COLOR_GREEN}[${_jail}]:${COLOR_RESET}" ## warn if matching configured (but not online) ip4.addr
jail -f "${bastille_jailsdir}/${_jail}/jail.conf" -c ${_jail}
ip=$(grep 'ip4.addr' "${bastille_jailsdir}/${_jail}/jail.conf" | awk '{print $3}' | sed 's/\;//g') ip=$(grep 'ip4.addr' "${bastille_jailsdir}/${_jail}/jail.conf" | awk '{print $3}' | sed 's/\;//g')
if ifconfig | grep -w "$ip" >/dev/null; then if ifconfig | grep -w "$ip" >/dev/null; then
echo -e "${COLOR_RED}Error: IP address ($ip) already in use.${COLOR_RESET}" echo -e "${COLOR_RED}Error: IP address ($ip) already in use.${COLOR_RESET}"
exit 1 exit 1
fi fi
## start the container
echo -e "${COLOR_GREEN}[${_jail}]:${COLOR_RESET}"
jail -f "${bastille_jailsdir}/${_jail}/jail.conf" -c ${_jail}
## add rctl limits ## add rctl limits
if [ -s "${bastille_jailsdir}/${_jail}/rctl.conf" ]; then if [ -s "${bastille_jailsdir}/${_jail}/rctl.conf" ]; then
while read _limits; do while read _limits; do