mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-14 18:49:17 -07:00
Refactoring stage VI (mail)
This commit is contained in:
parent
fb40168aa3
commit
f2133f9776
34 changed files with 219 additions and 486 deletions
18
func/db.sh
18
func/db.sh
|
@ -111,6 +111,10 @@ add_mysql_database() {
|
|||
query="GRANT ALL ON $database.* TO '$dbuser'@'localhost'
|
||||
IDENTIFIED BY '$dbpass'"
|
||||
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
|
||||
|
||||
query="SHOW GRANTS FOR '$dbuser'"
|
||||
md5=$(mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query")
|
||||
md5=$(echo "$md5" |grep 'PASSWORD' |tr ' ' '\n' |tail -n1 |cut -f 2 -d \')
|
||||
}
|
||||
|
||||
# Create PostgreSQL database
|
||||
|
@ -143,11 +147,14 @@ add_pgsql_database() {
|
|||
fi
|
||||
psql -h $HOST -U $USER -p $PORT -c "$query" &> /dev/null
|
||||
|
||||
query="GRANT ALL PRIVILEGES ON DATABASE $database TO $db_user"
|
||||
query="GRANT ALL PRIVILEGES ON DATABASE $database TO $dbuser"
|
||||
psql -h $HOST -U $USER -p $PORT -c "$query" &> /dev/null
|
||||
|
||||
query="GRANT CONNECT ON DATABASE template1 to $db_user"
|
||||
query="GRANT CONNECT ON DATABASE template1 to $dbuser"
|
||||
psql -h $HOST -U $USER -p $PORT -c "$query" &> /dev/null
|
||||
|
||||
query="SELECT rolpassword FROM pg_authid WHERE rolname='$dbuser';"
|
||||
md5=$(psql -h $HOST -U $USER -p $PORT -c "$query"|grep md5|cut -f 2 -d \ )
|
||||
}
|
||||
|
||||
# Check if database host do not exist in config
|
||||
|
@ -214,6 +221,10 @@ change_mysql_password() {
|
|||
query="GRANT ALL ON $database.* TO '$DBUSER'@'localhost'
|
||||
IDENTIFIED BY '$dbpass'"
|
||||
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
|
||||
|
||||
query="SHOW GRANTS FOR '$DBUSER'"
|
||||
md5=$(mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query")
|
||||
md5=$(echo "$md5" |grep 'PASSWORD' |tr ' ' '\n' |tail -n1 |cut -f 2 -d \')
|
||||
}
|
||||
|
||||
# Change PostgreSQL database password
|
||||
|
@ -237,6 +248,9 @@ change_pgsql_password() {
|
|||
|
||||
query="ALTER ROLE $DBUSER WITH LOGIN PASSWORD '$dbpass'"
|
||||
psql -h $HOST -U $USER -p $PORT -c "$query" &> /dev/null
|
||||
|
||||
query="SELECT rolpassword FROM pg_authid WHERE rolname='$DBUSER';"
|
||||
md5=$(psql -h $HOST -U $USER -p $PORT -c "$query"|grep md5|cut -f 2 -d \ )
|
||||
}
|
||||
|
||||
# Delete MySQL database
|
||||
|
|
|
@ -56,6 +56,30 @@ is_domain_new() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Checking mail account existance
|
||||
is_mail_new() {
|
||||
check_acc=$(grep "ACCOUNT='$1'" $USER_DATA/mail/$domain.conf)
|
||||
if [ ! -z "$check_acc" ]; then
|
||||
echo "Error: mail account $1 exist"
|
||||
log_event "$E_EXISTS" "$EVENT"
|
||||
exit
|
||||
fi
|
||||
check_als=$(awk -F "ALIAS='" '{print $2}' $USER_DATA/mail/$domain.conf )
|
||||
check_als=$(echo "$check_als" | cut -f 1 -d "'" | grep -w $1)
|
||||
if [ ! -z "$check_als" ]; then
|
||||
echo "Error: mail alias $1 exist"
|
||||
log_event "$E_EXISTS" "$EVENT"
|
||||
exit
|
||||
fi
|
||||
check_fwd=$(awk -F "FWD='" '{print $2}' $USER_DATA/mail/$domain.conf )
|
||||
check_fwd=$(echo "$check_fwd" | cut -f 1 -d "'" | grep -w $1)
|
||||
if [ ! -z "$check_fwd" ]; then
|
||||
echo "Error: mail forward $1 exist"
|
||||
log_event "$E_EXISTS" "$EVENT"
|
||||
exit
|
||||
fi
|
||||
}
|
||||
|
||||
# Update domain zone
|
||||
update_domain_zone() {
|
||||
conf="$HOMEDIR/$user/conf/dns/$domain.db"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue