github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #517 from ionescu-bogdan/patch-1

Browse source 
Sys quota - Patch 1
This commit is contained in:
Serghey Rodin 2015-12-11 20:50:54 +02:00
commit 070a62b05d
2 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

47
bin/v-add-sys-quota
View file

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# info: add system quota # info: add system quota
# opions: NONE # options: NONE
# #
# The script enables filesystem quota on /home patition # The script enables filesystem quota on /home patition
#----------------------------------------------------------# #----------------------------------------------------------#
# Variable&Function # # Variable & Function #
#----------------------------------------------------------# #----------------------------------------------------------#
# Includes # Includes
@ -19,7 +19,8 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
# Checking quota package # Checking quota package
if [ ! -e "/usr/sbin/setquota" ]; then quota=$(which --skip-alias --skip-functions quota 2>/dev/null)
if [ $? -ne 0 ]; then
if [ -e "/etc/redhat-release" ]; then if [ -e "/etc/redhat-release" ]; then
yum -y install quota >/dev/null 2>&1 yum -y install quota >/dev/null 2>&1
check_result $? "quota package installation failed" $E_UPDATE check_result $? "quota package installation failed" $E_UPDATE
@ -35,34 +36,40 @@ fi
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Adding usrquota option on /home partition # Adding group and user quota on /home partition
mnt=$(df -P /home |awk '{print $6}' |tail -n1) mnt=$(df -P /home | awk '{print $6}' | tail -n1)
lnr=$(cat -n /etc/fstab |awk '{print $1,$3}' |grep "$mnt$" |cut -f 1 -d ' ') lnr=$(cat -n /etc/fstab | awk '{print $1,$3}' | grep "$mnt$" | cut -f 1 -d ' ')
options=$(sed -n ${lnr}p /etc/fstab |awk '{print $4}') opt=$(sed -n ${lnr}p /etc/fstab | awk '{print $4}')
if [ -z "$(echo $options |grep usrquota)" ]; then fnd='usrquota\|grpquota\|usrjquota=aquota.user\|grpjquota=aquota.group\|jqfmt=vfsv0'
sed -i "$lnr s/$options/$options,usrquota/" /etc/fstab if [ $(echo $opt | tr ',' '\n' | grep -x $fnd | wc -l) -ne 5 ]; then
old=$(echo $(echo $opt | tr ',' '\n' | grep -v 'usrquota\|grpquota\|usrjquota=\|grpjquota=\|jqfmt=') | tr ' ' ',')
new='usrquota,grpquota,usrjquota=aquota.user,grpjquota=aquota.group,jqfmt=vfsv0'
sed -i "$lnr s/$opt/$old,$new/" /etc/fstab
mount -o remount $mnt mount -o remount $mnt
fi fi
# Adding aquota.user file # Adding v2 group and user quota index
if [ ! -e "$mnt/aquota.user" ]; then if [ ! -e "$mnt/aquota.user" ] || [ ! -e "$mnt/aquota.group" ]; then
quotacheck -cu $mnt >/dev/null 2>&1 quotaoff $mnt
quotacheck -cug $mnt >/dev/null 2>&1
quotacheck -aug >/dev/null 2>&1
fi fi
# Building fs quota index # Adding quotacheck on reboot
quotacheck -um $mnt touch /forcequotacheck
# Adding weekly cron job # Adding cron job
echo "quotacheck -um $mnt" > /etc/cron.daily/quotacheck echo '#!/bin/bash' > /etc/cron.daily/quotacheck
echo 'touch /forcequotacheck' >> /etc/cron.daily/quotacheck
chmod a+x /etc/cron.daily/quotacheck chmod a+x /etc/cron.daily/quotacheck
# Enabling fs quota # Enabling group and user quota
if [ ! -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then if [ ! -z "$(quotaon -pa | grep " $mnt " | grep 'user\|group' | grep 'is off')" ]; then
quotaon $mnt quotaon $mnt
check_result $? "quota can't be enabled in $mtn" $E_DISK check_result $? "quota can't be enabled in $mnt" $E_DISK
fi fi
# Updating DISK_QUOTA value # Updating vesta.conf value
if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then
echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf
else else

39
bin/v-delete-sys-quota
View file

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# info: delete system quota # info: delete system quota
# opions: NONE # options: NONE
# #
# The script disables filesystem quota on /home patition # The script disables filesystem quota on /home patition
#----------------------------------------------------------# #----------------------------------------------------------#
# Variable&Function # # Variable & Function #
#----------------------------------------------------------# #----------------------------------------------------------#
# Includes # Includes
@ -23,29 +23,34 @@ source $VESTA/conf/vesta.conf
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Deleting usrquota on /home partition # Deleting group and user quota on /home partition
mnt=$(df -P /home |awk '{print $6}' |tail -n1) mnt=$(df -P /home | awk '{print $6}' | tail -n1)
lnr=$(cat -n /etc/fstab |awk '{print $1,$3}' |grep "$mnt$" |cut -f 1 -d ' ') lnr=$(cat -n /etc/fstab | awk '{print $1,$3}' | grep "$mnt$" | cut -f 1 -d ' ')
options=$(sed -n ${lnr}p /etc/fstab |awk '{print $4}') opt=$(sed -n ${lnr}p /etc/fstab | awk '{print $4}')
if [ ! -z "$(echo $options |grep usrquota)" ]; then fnd='usrquota\|grpquota\|usrjquota=\|grpjquota=\|jqfmt='
sed -i "$lnr s/,usrquota//" /etc/fstab if [ ! -z "$(echo $opt | grep $fnd)" ]; then
rep=$(echo $(echo $opt | tr ',' '\n' | grep -v $fnd) | tr ' ' ',')
sed -i "$lnr s/$opt/$rep/" /etc/fstab
mount -o remount $mnt mount -o remount $mnt
fi fi
# Disabling fs quota # Disabling group and user quota
if [ -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then quotaoff=$(which --skip-alias --skip-functions quotaoff 2>/dev/null)
quotaoff $mnt if [ $? -eq 0 ]; then
if [ ! -z "$(quotaon -pa | grep " $mnt " | grep 'user\|group' | grep 'is on')" ]; then
$quotaoff $mnt
fi
fi fi
# Deleting quota index # Deleting v1 + v2 group and user quota index
if [ -e "$mnt/aquota.user" ]; then for idx in $(echo 'quota.user quota.group aquota.user aquota.group'); do
rm $mnt/aquota.user [ -e "$mnt/$idx" ] && rm -f $mnt/$idx
fi done
# Deleting weekly cron job # Deleting cron job
rm -f /etc/cron.daily/quotacheck rm -f /etc/cron.daily/quotacheck
# Updating DISK_QUOTA value # Updating vesta.conf value
if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then
echo "DISK_QUOTA='no'" >> $VESTA/conf/vesta.conf echo "DISK_QUOTA='no'" >> $VESTA/conf/vesta.conf
else else