github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 21:34:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

web function refactoring

Browse source
This commit is contained in:
Serghey Rodin 2016-06-09 17:09:55 +03:00
commit 325ca65f32
1 changed files with 41 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

90
bin/v-backup-user
View file

@ -28,7 +28,7 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '1' "$#" 'USER [NOTIFY]' check_args '1' "$#" 'USER [NOTIFY]'
validate_format 'user' is_format_valid 'user'
is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM' is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
@ -69,7 +69,7 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
echo -e "$mail_text" |$send_mail -s "$subj" $email echo -e "$mail_text" |$send_mail -s "$subj" $email
echo "Error: LA is too high" echo "Error: LA is too high"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_LA" "$EVENT" log_event "$E_LA" "$ARGUMENTS"
exit $E_LA exit $E_LA
fi fi
la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
@ -81,7 +81,7 @@ tmpdir=$(mktemp -p $BACKUP -d)
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "Can't create tmp dir $tmpdir" |$send_mail -s "$subj" $email echo "Can't create tmp dir $tmpdir" |$send_mail -s "$subj" $email
echo "Error: can't create tmp dir" echo "Error: can't create tmp dir"
log_event "$E_NOTEXIST" "$EVENT" log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST exit $E_NOTEXIST
fi fi
@ -167,30 +167,30 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
# Backup vhost config # Backup vhost config
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.tpl" tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.tpl"
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
get_web_config_brds get_web_config_lines $tpl_file $conf
sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
# Backup ssl vhost # Backup ssl vhost
if [ "$SSL" = 'yes' ]; then if [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl" tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
get_web_config_brds get_web_config_lines $tpl_file $conf
sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf
fi fi
# Backup proxy config # Backup proxy config
if [ ! -z "$PROXY" ]; then if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
get_web_config_brds get_web_config_lines $tpl_file $conf
sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf
fi fi
# Backup ssl proxy config # Backup ssl proxy config
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ] ; then if [ ! -z "$PROXY_SYSTEM" ] && [ "$SSL" = 'yes' ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
get_web_config_brds get_web_config_lines $tpl_file $conf
sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf
fi fi
@ -514,14 +514,14 @@ size="$(du -shm $tmpdir |cut -f 1)"
# Get current time # Get current time
end_time=$(date '+%s') end_time=$(date '+%s')
DATE=$(date +%F) time_n_date=$(date +'%T %F')
TIME=$(date +%T) time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Defining local storage function # Defining local storage function
local_backup(){ local_backup(){
rm -f $BACKUP/$user.$DATE.tar rm -f $BACKUP/$user.$date.tar
# Checking retention # Checking retention
backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\.") backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\.")
@ -548,18 +548,18 @@ local_backup(){
$send_mail -s "$subj" $email $send_mail -s "$subj" $email
echo "Error: Not enough disk space" echo "Error: Not enough disk space"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_DISK" "$EVENT" log_event "$E_DISK" "$ARGUMENTS"
exit $E_DISK exit $E_DISK
fi fi
# Creating final tarball # Creating final tarball
cd $tmpdir cd $tmpdir
tar -cf $BACKUP/$user.$DATE.tar . tar -cf $BACKUP/$user.$date.tar .
chmod 640 $BACKUP/$user.$DATE.tar chmod 640 $BACKUP/$user.$date.tar
chown admin:$user $BACKUP/$user.$DATE.tar chown admin:$user $BACKUP/$user.$date.tar
localbackup='yes' localbackup='yes'
echo -e "$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar" echo -e "$(date "+%F %T") Local: $BACKUP/$user.$date.tar"
msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar" msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$date.tar"
U_BACKUPS=$(ls $BACKUP/ |grep "^$user." |wc -l) U_BACKUPS=$(ls $BACKUP/ |grep "^$user." |wc -l)
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
} }
@ -586,17 +586,13 @@ ftp_backup() {
echo "$ftp_conf_error" |$send_mail -s "$subj" $email echo "$ftp_conf_error" |$send_mail -s "$subj" $email
echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist" echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_NOTEXIST" "$EVENT" log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST exit $E_NOTEXIST
fi fi
# Parse config # Parse config
source $VESTA/conf/ftp.backup.conf source $VESTA/conf/ftp.backup.conf
# Set current data
DATE=$(date +%F)
TIME=$(date +%T)
# Set default port # Set default port
if [ -z "$(grep 'PORT=' $VESTA/conf/ftp.backup.conf)" ]; then if [ -z "$(grep 'PORT=' $VESTA/conf/ftp.backup.conf)" ]; then
PORT='21' PORT='21'
@ -609,13 +605,13 @@ ftp_backup() {
$send_mail -s "$subj" $email $send_mail -s "$subj" $email
echo "Error: Parsing error" echo "Error: Parsing error"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_PARSING" "$EVENT" log_event "$E_PARSING" "$ARGUMENTS"
exit $E_PARSING exit $E_PARSING
fi fi
# Debug info # Debug info
echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$DATE.tar" echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$date.tar"
# Checking ftp connection # Checking ftp connection
fconn=$(ftpc) fconn=$(ftpc)
@ -626,7 +622,7 @@ ftp_backup() {
$send_mail -s "$subj" $email $send_mail -s "$subj" $email
echo "Error: can't login to ftp ftp://$USERNAME@$HOST" echo "Error: can't login to ftp ftp://$USERNAME@$HOST"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_CONNECT" "$EVENT" log_event "$E_CONNECT" "$ARGUMENTS"
exit $E_CONNECT exit $E_CONNECT
fi fi
@ -641,7 +637,7 @@ ftp_backup() {
$send_mail -s "$subj" $email $send_mail -s "$subj" $email
echo "Error: cant's create ftp folder ftp://$HOST$BPATH" echo "Error: cant's create ftp folder ftp://$HOST$BPATH"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_FTP" "$EVENT" log_event "$E_FTP" "$ARGUMENTS"
exit $E_FTP exit $E_FTP
fi fi
@ -661,13 +657,13 @@ ftp_backup() {
# Uploading backup archive # Uploading backup archive
if [ "$localbackup" = 'yes' ]; then if [ "$localbackup" = 'yes' ]; then
cd $BACKUP cd $BACKUP
ftpc "cd $BPATH" "put $user.$DATE.tar" ftpc "cd $BPATH" "put $user.$date.tar"
else else
cd $tmpdir cd $tmpdir
tar -cf $BACKUP/$user.$DATE.tar . tar -cf $BACKUP/$user.$date.tar .
cd $BACKUP/ cd $BACKUP/
ftpc "cd $BPATH" "put $user.$DATE.tar" ftpc "cd $BPATH" "put $user.$date.tar"
rm -f $user.$DATE.tar rm -f $user.$date.tar
fi fi
} }
@ -737,17 +733,13 @@ sftp_backup() {
echo "$sftp_conf_error" |$send_mail -s "$subj" $email echo "$sftp_conf_error" |$send_mail -s "$subj" $email
echo "Error: $VESTA/conf/sftp.backup.conf doesn't exist" echo "Error: $VESTA/conf/sftp.backup.conf doesn't exist"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_NOTEXIST" "$EVENT" log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST exit $E_NOTEXIST
fi fi
# Parse config # Parse config
source $VESTA/conf/sftp.backup.conf source $VESTA/conf/sftp.backup.conf
# Set current data
DATE=$(date +%F)
TIME=$(date +%T)
# Set default port # Set default port
if [ -z "$(grep 'PORT=' $VESTA/conf/sftp.backup.conf)" ]; then if [ -z "$(grep 'PORT=' $VESTA/conf/sftp.backup.conf)" ]; then
PORT='22' PORT='22'
@ -760,12 +752,12 @@ sftp_backup() {
$send_mail -s "$subj" $email $send_mail -s "$subj" $email
echo "Error: Parsing error" echo "Error: Parsing error"
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$E_PARSING" "$EVENT" log_event "$E_PARSING" "$ARGUMENTS"
exit $E_PARSING exit $E_PARSING
fi fi
# Debug info # Debug info
echo -e "$(date "+%F %T") Remote: sftp://$HOST/$BPATH/$user.$DATE.tar" echo -e "$(date "+%F %T") Remote: sftp://$HOST/$BPATH/$user.$date.tar"
# Checking network connection and write permissions # Checking network connection and write permissions
sftmpdir="$BPATH/vst.bK76A9SUkt" sftmpdir="$BPATH/vst.bK76A9SUkt"
@ -781,7 +773,7 @@ sftp_backup() {
$send_mail -s "$subj" $email;; $send_mail -s "$subj" $email;;
esac esac
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
log_event "$rc" "$EVENT" log_event "$rc" "$ARGUMENTS"
exit "$rc" exit "$rc"
fi fi
@ -799,16 +791,16 @@ sftp_backup() {
fi fi
# Uploading backup archive # Uploading backup archive
echo -e "$(date "+%F %T") Uploading $user.$DATE.tar ..." echo -e "$(date "+%F %T") Uploading $user.$date.tar ..."
if [ "$localbackup" = 'yes' ]; then if [ "$localbackup" = 'yes' ]; then
cd $BACKUP cd $BACKUP
sftpc "cd $BPATH" "put $user.$DATE.tar" > /dev/null 2>&1 sftpc "cd $BPATH" "put $user.$date.tar" > /dev/null 2>&1
else else
cd $tmpdir cd $tmpdir
tar -cf $BACKUP/$user.$DATE.tar . tar -cf $BACKUP/$user.$date.tar .
cd $BACKUP/ cd $BACKUP/
sftpc "cd $BPATH" "put $user.$DATE.tar" > /dev/null 2>&1 sftpc "cd $BPATH" "put $user.$date.tar" > /dev/null 2>&1
rm -f $user.$DATE.tar rm -f $user.$date.tar
fi fi
} }
@ -851,10 +843,10 @@ msg="$msg\n$(date "+%F %T") Runtime: $run_time $min"
# Removing duplicate # Removing duplicate
touch $USER_DATA/backup.conf touch $USER_DATA/backup.conf
sed -i "/$user.$DATE.tar/d" $USER_DATA/backup.conf sed -i "/$user.$date.tar/d" $USER_DATA/backup.conf
# Registering new backup # Registering new backup
backup_str="BACKUP='$user.$DATE.tar'" backup_str="BACKUP='$user.$date.tar'"
backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'" backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'"
backup_str="$backup_str WEB='${web_list// /,}'" backup_str="$backup_str WEB='${web_list// /,}'"
backup_str="$backup_str DNS='${dns_list// /,}'" backup_str="$backup_str DNS='${dns_list// /,}'"
@ -862,7 +854,7 @@ backup_str="$backup_str MAIL='${mail_list// /,}'"
backup_str="$backup_str DB='${db_list// /,}'" backup_str="$backup_str DB='${db_list// /,}'"
backup_str="$backup_str CRON='$cron_list'" backup_str="$backup_str CRON='$cron_list'"
backup_str="$backup_str UDIR='${udir_list// /,}'" backup_str="$backup_str UDIR='${udir_list// /,}'"
backup_str="$backup_str RUNTIME='$run_time' TIME='$TIME' DATE='$DATE'" backup_str="$backup_str RUNTIME='$run_time' TIME='$time' DATE='$date'"
echo "$backup_str" >> $USER_DATA/backup.conf echo "$backup_str" >> $USER_DATA/backup.conf
# Removing old backups # Removing old backups
@ -881,6 +873,6 @@ if [ "$notify" != 'no' ]; then
fi fi
# Logging # Logging
log_event "$OK" "$EVENT" log_event "$OK" "$ARGUMENTS"
exit exit