Skip to content

Commit 325ca65

Browse files
serghey-rodinserghey-rodin
committed
web function refactoring
1 parent 8b237eb commit 325ca65

File tree

1 file changed

+41
-49
lines changed

1 file changed

+41
-49
lines changed

‎bin/v-backup-user‎

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ source $VESTA/conf/vesta.conf
2828
#----------------------------------------------------------#
2929

3030
check_args '1' "$#" 'USER [NOTIFY]'
31-
validate_format 'user'
31+
is_format_valid 'user'
3232
is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM'
3333
is_object_valid 'user' 'USER' "$user"
3434
is_object_unsuspended 'user' 'USER' "$user"
@@ -69,7 +69,7 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
6969
echo -e "$mail_text" |$send_mail -s "$subj" $email
7070
echo "Error: LA is too high"
7171
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
72-
log_event "$E_LA" "$EVENT"
72+
log_event "$E_LA" "$ARGUMENTS"
7373
exit $E_LA
7474
fi
7575
la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
@@ -81,7 +81,7 @@ tmpdir=$(mktemp -p $BACKUP -d)
8181
if [ "$?" -ne 0 ]; then
8282
echo "Can't create tmp dir $tmpdir" |$send_mail -s "$subj" $email
8383
echo "Error: can't create tmp dir"
84-
log_event "$E_NOTEXIST" "$EVENT"
84+
log_event "$E_NOTEXIST" "$ARGUMENTS"
8585
exit $E_NOTEXIST
8686
fi
8787

@@ -167,30 +167,30 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
167167
# Backup vhost config
168168
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.tpl"
169169
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
170-
get_web_config_brds
170+
get_web_config_lines $tpl_file $conf
171171
sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
172172

173173
# Backup ssl vhost
174174
if [ "$SSL" = 'yes' ]; then
175175
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
176176
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
177-
get_web_config_brds
177+
get_web_config_lines $tpl_file $conf
178178
sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf
179179
fi
180180

181181
# Backup proxy config
182-
if [ ! -z "$PROXY" ]; then
182+
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
183183
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
184184
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
185-
get_web_config_brds
185+
get_web_config_lines $tpl_file $conf
186186
sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf
187187
fi
188188

189189
# Backup ssl proxy config
190-
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ] ; then
190+
if [ ! -z "$PROXY_SYSTEM" ] && [ "$SSL" = 'yes' ]; then
191191
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
192192
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
193-
get_web_config_brds
193+
get_web_config_lines $tpl_file $conf
194194
sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf
195195
fi
196196

@@ -514,14 +514,14 @@ size="$(du -shm $tmpdir |cut -f 1)"
514514

515515
# Get current time
516516
end_time=$(date '+%s')
517-
DATE=$(date +%F)
518-
TIME=$(date +%T)
519-
517+
time_n_date=$(date +'%T %F')
518+
time=$(echo "$time_n_date" |cut -f 1 -d \ )
519+
date=$(echo "$time_n_date" |cut -f 2 -d \ )
520520

521521
# Defining local storage function
522522
local_backup(){
523523

524-
rm -f $BACKUP/$user.$DATE.tar
524+
rm -f $BACKUP/$user.$date.tar
525525

526526
# Checking retention
527527
backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\.")
@@ -548,18 +548,18 @@ local_backup(){
548548
$send_mail -s "$subj" $email
549549
echo "Error: Not enough disk space"
550550
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
551-
log_event "$E_DISK" "$EVENT"
551+
log_event "$E_DISK" "$ARGUMENTS"
552552
exit $E_DISK
553553
fi
554554

555555
# Creating final tarball
556556
cd $tmpdir
557-
tar -cf $BACKUP/$user.$DATE.tar .
558-
chmod 640 $BACKUP/$user.$DATE.tar
559-
chown admin:$user $BACKUP/$user.$DATE.tar
557+
tar -cf $BACKUP/$user.$date.tar .
558+
chmod 640 $BACKUP/$user.$date.tar
559+
chown admin:$user $BACKUP/$user.$date.tar
560560
localbackup='yes'
561-
echo -e "$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar"
562-
msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar"
561+
echo -e "$(date "+%F %T") Local: $BACKUP/$user.$date.tar"
562+
msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$date.tar"
563563
U_BACKUPS=$(ls $BACKUP/ |grep "^$user." |wc -l)
564564
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
565565
}
@@ -586,17 +586,13 @@ ftp_backup() {
586586
echo "$ftp_conf_error" |$send_mail -s "$subj" $email
587587
echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist"
588588
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
589-
log_event "$E_NOTEXIST" "$EVENT"
589+
log_event "$E_NOTEXIST" "$ARGUMENTS"
590590
exit $E_NOTEXIST
591591
fi
592592

593593
# Parse config
594594
source $VESTA/conf/ftp.backup.conf
595595

596-
# Set current data
597-
DATE=$(date +%F)
598-
TIME=$(date +%T)
599-
600596
# Set default port
601597
if [ -z "$(grep 'PORT=' $VESTA/conf/ftp.backup.conf)" ]; then
602598
PORT='21'
@@ -609,13 +605,13 @@ ftp_backup() {
609605
$send_mail -s "$subj" $email
610606
echo "Error: Parsing error"
611607
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
612-
log_event "$E_PARSING" "$EVENT"
608+
log_event "$E_PARSING" "$ARGUMENTS"
613609
exit $E_PARSING
614610
fi
615611

616612

617613
# Debug info
618-
echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$DATE.tar"
614+
echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$date.tar"
619615

620616
# Checking ftp connection
621617
fconn=$(ftpc)
@@ -626,7 +622,7 @@ ftp_backup() {
626622
$send_mail -s "$subj" $email
627623
echo "Error: can't login to ftp ftp://$USERNAME@$HOST"
628624
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
629-
log_event "$E_CONNECT" "$EVENT"
625+
log_event "$E_CONNECT" "$ARGUMENTS"
630626
exit $E_CONNECT
631627
fi
632628

@@ -641,7 +637,7 @@ ftp_backup() {
641637
$send_mail -s "$subj" $email
642638
echo "Error: cant's create ftp folder ftp://$HOST$BPATH"
643639
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
644-
log_event "$E_FTP" "$EVENT"
640+
log_event "$E_FTP" "$ARGUMENTS"
645641
exit $E_FTP
646642
fi
647643

@@ -661,13 +657,13 @@ ftp_backup() {
661657
# Uploading backup archive
662658
if [ "$localbackup" = 'yes' ]; then
663659
cd $BACKUP
664-
ftpc "cd $BPATH" "put $user.$DATE.tar"
660+
ftpc "cd $BPATH" "put $user.$date.tar"
665661
else
666662
cd $tmpdir
667-
tar -cf $BACKUP/$user.$DATE.tar .
663+
tar -cf $BACKUP/$user.$date.tar .
668664
cd $BACKUP/
669-
ftpc "cd $BPATH" "put $user.$DATE.tar"
670-
rm -f $user.$DATE.tar
665+
ftpc "cd $BPATH" "put $user.$date.tar"
666+
rm -f $user.$date.tar
671667
fi
672668
}
673669

@@ -737,17 +733,13 @@ sftp_backup() {
737733
echo "$sftp_conf_error" |$send_mail -s "$subj" $email
738734
echo "Error: $VESTA/conf/sftp.backup.conf doesn't exist"
739735
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
740-
log_event "$E_NOTEXIST" "$EVENT"
736+
log_event "$E_NOTEXIST" "$ARGUMENTS"
741737
exit $E_NOTEXIST
742738
fi
743739

744740
# Parse config
745741
source $VESTA/conf/sftp.backup.conf
746742

747-
# Set current data
748-
DATE=$(date +%F)
749-
TIME=$(date +%T)
750-
751743
# Set default port
752744
if [ -z "$(grep 'PORT=' $VESTA/conf/sftp.backup.conf)" ]; then
753745
PORT='22'
@@ -760,12 +752,12 @@ sftp_backup() {
760752
$send_mail -s "$subj" $email
761753
echo "Error: Parsing error"
762754
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
763-
log_event "$E_PARSING" "$EVENT"
755+
log_event "$E_PARSING" "$ARGUMENTS"
764756
exit $E_PARSING
765757
fi
766758

767759
# Debug info
768-
echo -e "$(date "+%F %T") Remote: sftp://$HOST/$BPATH/$user.$DATE.tar"
760+
echo -e "$(date "+%F %T") Remote: sftp://$HOST/$BPATH/$user.$date.tar"
769761

770762
# Checking network connection and write permissions
771763
sftmpdir="$BPATH/vst.bK76A9SUkt"
@@ -781,7 +773,7 @@ sftp_backup() {
781773
$send_mail -s "$subj" $email;;
782774
esac
783775
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
784-
log_event "$rc" "$EVENT"
776+
log_event "$rc" "$ARGUMENTS"
785777
exit "$rc"
786778
fi
787779

@@ -799,16 +791,16 @@ sftp_backup() {
799791
fi
800792

801793
# Uploading backup archive
802-
echo -e "$(date "+%F %T") Uploading $user.$DATE.tar ..."
794+
echo -e "$(date "+%F %T") Uploading $user.$date.tar ..."
803795
if [ "$localbackup" = 'yes' ]; then
804796
cd $BACKUP
805-
sftpc "cd $BPATH" "put $user.$DATE.tar" > /dev/null 2>&1
797+
sftpc "cd $BPATH" "put $user.$date.tar" > /dev/null 2>&1
806798
else
807799
cd $tmpdir
808-
tar -cf $BACKUP/$user.$DATE.tar .
800+
tar -cf $BACKUP/$user.$date.tar .
809801
cd $BACKUP/
810-
sftpc "cd $BPATH" "put $user.$DATE.tar" > /dev/null 2>&1
811-
rm -f $user.$DATE.tar
802+
sftpc "cd $BPATH" "put $user.$date.tar" > /dev/null 2>&1
803+
rm -f $user.$date.tar
812804
fi
813805
}
814806

@@ -851,18 +843,18 @@ msg="$msg\n$(date "+%F %T") Runtime: $run_time $min"
851843

852844
# Removing duplicate
853845
touch $USER_DATA/backup.conf
854-
sed -i "/$user.$DATE.tar/d" $USER_DATA/backup.conf
846+
sed -i "/$user.$date.tar/d" $USER_DATA/backup.conf
855847

856848
# Registering new backup
857-
backup_str="BACKUP='$user.$DATE.tar'"
849+
backup_str="BACKUP='$user.$date.tar'"
858850
backup_str="$backup_str TYPE='$BACKUP_SYSTEM' SIZE='$size'"
859851
backup_str="$backup_str WEB='${web_list// /,}'"
860852
backup_str="$backup_str DNS='${dns_list// /,}'"
861853
backup_str="$backup_str MAIL='${mail_list// /,}'"
862854
backup_str="$backup_str DB='${db_list// /,}'"
863855
backup_str="$backup_str CRON='$cron_list'"
864856
backup_str="$backup_str UDIR='${udir_list// /,}'"
865-
backup_str="$backup_str RUNTIME='$run_time' TIME='$TIME' DATE='$DATE'"
857+
backup_str="$backup_str RUNTIME='$run_time' TIME='$time' DATE='$date'"
866858
echo "$backup_str" >> $USER_DATA/backup.conf
867859

868860
# Removing old backups
@@ -881,6 +873,6 @@ if [ "$notify" != 'no' ]; then
881873
fi
882874

883875
# Logging
884-
log_event "$OK" "$EVENT"
876+
log_event "$OK" "$ARGUMENTS"
885877

886878
exit

0 commit comments

Comments
 (0)