mirror of
https://github.com/myvesta/vesta
synced 2025-08-14 18:49:21 -07:00
Merge pull request #4 from serghey-rodin/master
updates from master branch
This commit is contained in:
commit
5d10ea26d5
24 changed files with 98 additions and 82 deletions
10
func/db.sh
10
func/db.sh
|
@ -47,7 +47,10 @@ mysql_connect() {
|
|||
}
|
||||
|
||||
mysql_query() {
|
||||
mysql --defaults-file=$mycnf -e "$1" 2>/dev/null
|
||||
sql_tmp=$(mktemp)
|
||||
echo "$1" > $sql_tmp
|
||||
mysql --defaults-file=$mycnf < "$sql_tmp" 2>/dev/null
|
||||
rm -f "$sql_tmp"
|
||||
}
|
||||
|
||||
mysql_dump() {
|
||||
|
@ -89,7 +92,10 @@ psql_connect() {
|
|||
}
|
||||
|
||||
psql_query() {
|
||||
psql -h $HOST -U $USER -c "$1" 2>/dev/null
|
||||
sql_tmp=$(mktemp)
|
||||
echo "$1" > $sql_tmp
|
||||
psql -h $HOST -U $USER -f "$sql_tmp" 2>/dev/null
|
||||
rm -f $sql_tmp
|
||||
}
|
||||
|
||||
psql_dump() {
|
||||
|
|
|
@ -287,6 +287,13 @@ is_hash_valid() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Check if directory is a symlink
|
||||
is_dir_symlink() {
|
||||
if [[ -L "$1" ]]; then
|
||||
check_result $E_FORBIDEN "$1 directory is a symlink"
|
||||
fi
|
||||
}
|
||||
|
||||
# Get object value
|
||||
get_object_value() {
|
||||
object=$(grep "$2='$3'" $USER_DATA/$1.conf)
|
||||
|
|
|
@ -71,6 +71,9 @@ rebuild_user_conf() {
|
|||
echo "$BIN/v-update-web-domains-disk $user" \
|
||||
>> $VESTA/data/queue/disk.pipe
|
||||
|
||||
if [[ -L "$HOMEDIR/$user/web" ]]; then
|
||||
rm $HOMEDIR/$user/web
|
||||
fi
|
||||
mkdir -p $HOMEDIR/$user/conf/web
|
||||
mkdir -p $HOMEDIR/$user/web
|
||||
mkdir -p $HOMEDIR/$user/tmp
|
||||
|
@ -105,6 +108,9 @@ rebuild_user_conf() {
|
|||
echo "$BIN/v-update-mail-domains-disk $user" \
|
||||
>> $VESTA/data/queue/disk.pipe
|
||||
|
||||
if [[ -L "$HOMEDIR/$user/mail" ]]; then
|
||||
rm $HOMEDIR/$user/mail
|
||||
fi
|
||||
mkdir -p $HOMEDIR/$user/conf/mail
|
||||
mkdir -p $HOMEDIR/$user/mail
|
||||
chmod 751 $HOMEDIR/$user/mail
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue