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

refactoring: log_event(), is_format_valid()

Browse source
This commit is contained in:
Serghey Rodin 2016-06-24 16:31:43 +03:00
commit a61a6e979e
52 changed files with 582 additions and 1170 deletions
Download patch file Download diff file Expand all files Collapse all files

40
bin/v-delete-user
View file

@ -38,52 +38,37 @@ fi
# Action #
#----------------------------------------------------------#
# Checking web system is enabled
# Deleting web domains
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
$BIN/v-unsuspend-web-domains $user $restart
$BIN/v-delete-web-domains $user $restart
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
fi
check_result "$?" "web domain deletion failed"
fi
# Checking dns system is enabled
# Deleting dns domains
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
$BIN/v-unsuspend-dns-domains $user $restart
$BIN/v-delete-dns-domains $user $restart
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
fi
check_result "$?" "dns domain deletion failed"
fi
# Checking mail system is enabled
# Deleting mail domains
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
$BIN/v-unsuspend-mail-domains $user
$BIN/v-delete-mail-domains $user
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
fi
check_result "$?" "mail domain deletion failed"
fi
# Checking db system is enabled
# Deleting databases
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
$BIN/v-unsuspend-databases $user
$BIN/v-delete-databases $user
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
fi
check_result "$?" "database deletion failed"
fi
# Checking ip
# Releasing user ips
$BIN/v-delete-user-ips "$user"
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
fi
check_result "$?" "user ip release failed"
# Deleteing user pipes
sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe
@ -96,14 +81,13 @@ fi
# Deleting system user
/usr/sbin/userdel -f $user >> /dev/null 2>&1
if [ "$?" != 0 ]; then
if [ $? -ne 0 ]; then
sed -i "/^$user:/d" /etc/passwd
sed -i "/^$user:/d" /etc/shadow
fi
/usr/sbin/groupdel $user >> /dev/null 2>&1
if [ "$?" != 0 ]; then
if [ $? -ne 0 ]; then
sed -i "/^$user:/d" /etc/group
fi