diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy old mode 100755 new mode 100644 index ca63c16d8..dd593db44 --- a/bin/v-restart-proxy +++ b/bin/v-restart-proxy @@ -49,8 +49,20 @@ if [ -z "$PROXY_SYSTEM" ] || [ "$PROXY_SYSTEM" = 'remote' ]; then exit fi + if [ -f "/usr/local/vesta/web/inc/nginx_proxy" ]; then + # if vesta is behind default nginx, restart in background with 15 sec delay + # background restart + if [ "$1" = 'background' ]; then + # Restart system + sleep 25 + service $PROXY_SYSTEM restart >/dev/null 2>&1 + if [ $? -ne 0 ]; then + send_email_report + check_result $E_RESTART "$PROXY_SYSTEM restart failed" + fi + # if vesta is behind default nginx, restart in background with 15 sec delay # background restart if [ "$1" = 'background' ]; then diff --git a/bin/v-restore-user b/bin/v-restore-user index 4816fde88..8aef31b1e 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -409,7 +409,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then chown $user $tmpdir chmod u+w $HOMEDIR/$user/web/$domain sudo -u $user tar -xzpf $tmpdir/web/$domain/domain_data.tar.gz \ - -C $HOMEDIR/$user/web/$domain/ --exclude=logs/* \ + -C $HOMEDIR/$user/web/$domain/ --exclude=./logs/* \ 2> $HOMEDIR/$user/web/$domain/restore_errors.log if [ -e "$HOMEDIR/$user/web/$domain/restore_errors.log" ]; then chown $user:$user $HOMEDIR/$user/web/$domain/restore_errors.log diff --git a/func/db.sh b/func/db.sh index 1b48d122b..1373d7412 100644 --- a/func/db.sh +++ b/func/db.sh @@ -322,7 +322,7 @@ delete_pgsql_database() { psql_connect $HOST query="REVOKE ALL PRIVILEGES ON DATABASE $database FROM $DBUSER" - psql_qyery "$query" > /dev/null + psql_query "$query" > /dev/null query="DROP DATABASE $database" psql_query "$query" > /dev/null diff --git a/func/domain.sh b/func/domain.sh index 713cc52af..fc615e7be 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -412,6 +412,20 @@ update_domain_zone() { VALUE=$(idn --quiet -a -t "$VALUE") fi + # Split long TXT entries into 255 chunks + if [ "$TYPE" = 'TXT' ]; then + txtlength=${#VALUE} + if [ $txtlength -gt 255 ]; then + if [[ ${VALUE:0:1} = '"' ]]; then + txtlength=$(( $txtlength - 2 )) + VALUE=${VALUE:1:txtlength} + fi + VALUE=$(echo $VALUE | fold -w 255 | xargs -I '$' echo -n ' "$"') + VALUE=${VALUE:1} + VALUE="($VALUE)" + fi + fi + if [ "$SUSPENDED" != 'yes' ]; then eval echo -e "\"$fields\""|sed "s/%quote%/'/g" >> $zn_conf fi