ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete implemented, permissions changed, root permissions no longer necessary to start script, it will run into problems early enuogh

Browse Source
This commit is contained in:
erdgeist 2005-09-25 11:57:21 +00:00
parent eba8f0e8c2
commit 2fcd7f1a76
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -8,5 +8,5 @@ install:
sed s:EZJAIL_PREFIX:${PREFIX}: man1/ezjail-admin.1 > ${PREFIX}/man/man1/ezjail-admin.1 sed s:EZJAIL_PREFIX:${PREFIX}: man1/ezjail-admin.1 > ${PREFIX}/man/man1/ezjail-admin.1
sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.conf.5 > ${PREFIX}/man/man5/ezjail.conf.5 sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.conf.5 > ${PREFIX}/man/man5/ezjail.conf.5
sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.5 > ${PREFIX}/man/man5/ezjail.5 sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.5 > ${PREFIX}/man/man5/ezjail.5
chmod 744 ${PREFIX}/etc/rc.d/ezjail ${PREFIX}/bin/ezjail-admin chmod 755 ${PREFIX}/etc/rc.d/ezjail ${PREFIX}/bin/ezjail-admin
chown root:wheel ${PREFIX}/man/man1/ezjail-admin.1 ${PREFIX}/man/man5/ezjail.conf.5 ${PREFIX}/man/man5/ezjail.5 chown root:wheel ${PREFIX}/man/man1/ezjail-admin.1 ${PREFIX}/man/man5/ezjail.conf.5 ${PREFIX}/man/man5/ezjail.5

36
ezjail-admin
View File

@ -4,10 +4,6 @@
ezjail_prefix=EZJAIL_PREFIX ezjail_prefix=EZJAIL_PREFIX
ezjail_jailcfgs=${ezjail_prefix}/etc/ezjail ezjail_jailcfgs=${ezjail_prefix}/etc/ezjail
if [ "0" != "`id -u`" ]; then
echo "Retry as root"; exit 1;
fi
if [ -f ${ezjail_prefix}/etc/ezjail.conf ]; then if [ -f ${ezjail_prefix}/etc/ezjail.conf ]; then
. ${ezjail_prefix}/etc/ezjail.conf; . ${ezjail_prefix}/etc/ezjail.conf;
fi fi
@ -71,7 +67,7 @@ create)
# name will be foo_com in most scripts # name will be foo_com in most scripts
newjail_name=`echo $newjail_name | tr /~ __`; newjail_name=`echo $newjail_name | tr /~ __`;
newjail_root=${newjail_root:-"$ezjail_jaildir/$newjail_name"} newjail_root=${newjail_root:-"$ezjail_jaildir/$newjail_name"}
newjail_nname=`echo $newjail_name | tr . _`; newjail_nname=`echo $newjail_nname | tr . _`;
# if jail root specified on command line is not absolute, # if jail root specified on command line is not absolute,
# make it absolute inside our jail directory # make it absolute inside our jail directory
@ -142,17 +138,41 @@ delete)
echo 'Usage: ezjail delete [-w] jailname'; exit 1; echo 'Usage: ezjail delete [-w] jailname'; exit 1;
fi fi
# tidy up jail name the ezjail way
oldjail_nname=`echo $oldjail_name | tr /~. ___`;
# check for existence of jail in our records # check for existence of jail in our records
if [ ! -f ${ezjail_jailcfgs}/${oldjail_name} ]; then if [ ! -f ${ezjail_jailcfgs}/${oldjail_nname} ]; then
echo 'Error: Nothing known about jail $oldjail_name'; exit 1 echo 'Error: Nothing known about jail $oldjail_name'; exit 1
fi fi
. ${ezjail_jailcfgs}/${oldjail_name} # fetch information about the jail to be gone
eval jail_root=\"\$jail_${jail}_root\" # by parsing our records
. ${ezjail_jailcfgs}/${oldjail_nname}
eval oldjail_root=\"\$jail_${oldjail_nname}_root\"
# now we know everything we need to let the jail be gone
# remove entry from ezjail resource structure
echo rm -f ${ezjail_jailcfgs}/${oldjail_nname}
# delete fstab.JAILNAME
echo rm -f /etc/fstab.$oldjail_nname
# if there is a soft link pointing to the jail root, remove it
oldjail_softlink=$ezjail_jaildir/`basename $oldjail_root`
if [ -L $oldjail_softlink ]; then
echo rm $oldjail_softlink
fi
# if wiping the jail was requested, remove it
if [ $oldjail_wipe = "YES" ]; then
echo rm -rf $oldjail_root
fi
;; ;;
list) list)
jail_list=`ls $ezjail_jailcfgs` jail_list=`ls $ezjail_jailcfgs`
echo $jail_list
for jail in $jail_list; do for jail in $jail_list; do
. ${ezjail_jailcfgs}/$jail . ${ezjail_jailcfgs}/$jail
eval jail_ip=\"\$jail_${jail}_ip\"; echo -n "$jail_ip " eval jail_ip=\"\$jail_${jail}_ip\"; echo -n "$jail_ip "