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

workaround for talky ftp

Browse source
This commit is contained in:
Serghey Rodin 2013-10-10 12:57:16 +03:00
commit 7edeb110b6
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/v-add-backup-ftp-host
View file

@ -23,7 +23,7 @@ source $VESTA/conf/vesta.conf
# Defining ftp command function # Defining ftp command function
ftpc() { ftpc() {
/usr/bin/ftp -n $host $ftp_port <<EOF ftp -n $host $ftp_port <<EOF
quote USER $ftp_user quote USER $ftp_user
quote PASS $ftp_password quote PASS $ftp_password
binary binary
@ -48,7 +48,8 @@ validate_format 'host' 'ftp_user' 'ftp_password'
#----------------------------------------------------------# #----------------------------------------------------------#
# Checking network connection # Checking network connection
if [ ! -z "$(ftpc)" ]; then ftp_connect=$(ftpc)
if [ ! -z "$(echo $ftp_connect |grep -i -e error -e 'not connected')" ]; then
echo "Error: can't login to ftp" echo "Error: can't login to ftp"
log_event "$E_CONNECT" "$EVENT" log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT exit $E_CONNECT
@ -60,7 +61,7 @@ ftmpdir=$(mktemp -u -p "$ftp_path")
ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir") ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir")
if [ ! -z "$ftp_result" ] ; then if [ ! -z "$ftp_result" ] ; then
rm -rf $tmpdir rm -rf $tmpdir
echo "Error: can't create temp folder on the ftp" #echo "Error: can't create temp folder on the ftp"
log_event "$E_FTP" "$EVENT" log_event "$E_FTP" "$EVENT"
exit $E_FTP exit $E_FTP
fi fi

3
bin/v-backup-user
View file

@ -556,7 +556,8 @@ ftp_backup() {
echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar" echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar"
# Checking ftp connection # Checking ftp connection
if [ ! -z "$(ftpc)" ]; then ftp_connect=$(ftpc)
if [ ! -z "$(echo $ftp_connect |grep -i -e error -e 'not conn')" ]; then
rm -rf $tmpdir rm -rf $tmpdir
echo "Can't login to ftp://$USERNAME@$HOST" |\ echo "Can't login to ftp://$USERNAME@$HOST" |\
$send_mail -s "$subj" $email $send_mail -s "$subj" $email