msb/vhost-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make jail mounts work with all file system devices

Browse Source
This commit is contained in:
Matthew Saunders Brown 2022-08-03 15:47:17 -07:00
parent 59db6719db
commit 30c93cc910
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/vhost-del.sh
View File

@ -54,13 +54,13 @@ if [[ -f /etc/varnish/sites.d/$domain.vcl ]]; then
fi
# if virtualhost is mounted in a jail, unmount it
if grep -q "^/dev/sda /usr/jails/$username/srv/www/$domain " /etc/mtab; then
if grep -q " /usr/jails/$username/srv/www/$domain " /etc/mtab; then
umount /usr/jails/$username/srv/www/$domain
fi
# if virtualhost mount in fstab.jails exists remove it
if grep -q "/usr/jails/$username/srv/www/$domain" /etc/fstab.jails; then
sed -i "\|/usr/jails/$username/srv/www/$domain|d" /etc/fstab.jails
if grep -q " /usr/jails/$username/srv/www/$domain " /etc/fstab.jails; then
sed -i "\| /usr/jails/$username/srv/www/$domain |d" /etc/fstab.jails
fi
# if virtualhost symlink exists in jail remove it

4
bin/vhost-user-del.sh
View File

@ -42,7 +42,7 @@ do
done
# check for jailed vhost mount
if /bin/grep -q "^/dev/sda /usr/jails/$username/srv/www/" /etc/mtab; then
if /bin/grep -q " /usr/jails/$username/srv/www/" /etc/mtab; then
echo user \"$username\" has one or more jailed vhosts mounted
exit 1
fi
@ -70,7 +70,7 @@ if [[ -f "/etc/php/$phpVersion/fpm/pool.d/$username.conf" ]]; then
fi
# if users home dir is mounted in a jail, unmount it
if grep -q "^/dev/sda /usr/jails/$username/home/$username " /etc/mtab; then
if grep -q " /usr/jails/$username/home/$username " /etc/mtab; then
umount /usr/jails/$username/home/$username
fi