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

Fix backup restore

Browse source
This commit is contained in:
Alexandr Loskutov 2018-01-18 14:32:25 +02:00
commit bea7ccd25e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/v-restore-user
View file

@ -374,8 +374,8 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
# Copying ssl certificates # Copying ssl certificates
if [ "$SSL" = 'yes' ]; then if [ "$SSL" = 'yes' ]; then
for crt in $(ls $tmpdir/web/$domain/conf |grep ssl); do for crt in $(ls $tmpdir/web/$domain/conf |grep ssl); do
crt=$(echo "$crt" |sed "s/ssl.//") crt=$(echo $crt|sed -e "s/ssl.//")
cp -f $tmpdir/web/$domain/conf/ssl.$crt $USER_DATA/ssl/$crt cp -f $tmpdir/web/$domain/conf/$crt $USER_DATA/ssl/$crt
done done
fi fi

6
func/main.sh
View file

@ -634,8 +634,8 @@ is_date_format_valid() {
is_dbuser_format_valid() { is_dbuser_format_valid() {
exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|/|\|\"|'|;|%|\`| ]" exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|/|\|\"|'|;|%|\`| ]"
if [ 17 -le ${#1} ]; then if [ 17 -le ${#1} ]; then
check_result $E_INVALID "mysql username can be up to 16 characters long" check_result $E_INVALID "mysql username can be up to 16 characters long"
fi fi
if [[ "$1" =~ $exclude ]]; then if [[ "$1" =~ $exclude ]]; then
check_result $E_INVALID "invalid $2 format :: $1" check_result $E_INVALID "invalid $2 format :: $1"
fi fi
@ -770,7 +770,7 @@ is_name_format_valid() {
# Object validator # Object validator
is_object_format_valid() { is_object_format_valid() {
if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,64}[[:alnum:]]$ ]]; then
check_result $E_INVALID "invalid $2 format :: $1" check_result $E_INVALID "invalid $2 format :: $1"
fi fi
} }