diff --git a/bin/v-add-database b/bin/v-add-database index d4d791784..a3c3ff453 100755 --- a/bin/v-add-database +++ b/bin/v-add-database @@ -19,7 +19,7 @@ user=$1 database="$user"_"$2" dbuser="$user"_"$3" -password=$4 +password=$4; HIDE=4 type=${5-mysql} host=$6 charset=${7-UTF8} @@ -30,10 +30,6 @@ source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-add-database-host b/bin/v-add-database-host index ead97aec3..cf0862eca 100755 --- a/bin/v-add-database-host +++ b/bin/v-add-database-host @@ -17,7 +17,7 @@ type=$1 host=$2 dbuser=$3 -password=$4 +password=$4; HIDE=4 max_db=${6-500} charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8} template=${8-template1} @@ -27,10 +27,6 @@ source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - is_mysql_host_alive() { mycnf=$(mktemp) echo "[client]">$mycnf diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 814b55857..3fbe6ae9b 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -15,7 +15,7 @@ domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") account=$(echo $3 | tr '[:upper:]' '[:lower:]') -password=$4 +password=$4; HIDE=4 quota=${5-unlimited} # Includes @@ -23,10 +23,6 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-add-user b/bin/v-add-user index 568d7bbe5..9afb1e9d0 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -11,7 +11,7 @@ # Argument defenition user=$1 -password=$2 +password=$2; HIDE=2 email=$3 package=${4-default} fname=$5 @@ -21,10 +21,6 @@ lname=$6 source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Hiding password -A2='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - is_user_free() { check_sysuser=$(cut -f 1 -d : /etc/passwd | grep -w "$user" ) if [ ! -z "$check_sysuser" ] || [ -e "$USER_DATA" ]; then diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 1eaace855..57afec481 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -14,7 +14,7 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ftp_user=${1}_${3} -password=$4 +password=$4; HIDE=4 ftp_path=$5 # Includes @@ -22,10 +22,6 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-add-web-domain-httpauth b/bin/v-add-web-domain-httpauth index d2371afdd..4b336629e 100755 --- a/bin/v-add-web-domain-httpauth +++ b/bin/v-add-web-domain-httpauth @@ -13,7 +13,7 @@ user=$1 domain=$2 auth_user=$3 -password=$4 +password=$4; HIDE=4 restart=${5-yes} # Includes @@ -21,10 +21,6 @@ source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - # Definining htpasswd file htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess" htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd" diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index 9d4b766b0..dbbd31582 100755 --- a/bin/v-add-web-domain-stats-user +++ b/bin/v-add-web-domain-stats-user @@ -13,17 +13,13 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) stats_user=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-backup-user b/bin/v-backup-user index dd86cea77..9ebd0b69b 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -54,12 +54,11 @@ if [ "$notify" != 'no' ]; then email=$(get_user_value '$CONTACT') else subj="$user → backup failed" - email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \') + email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \') fi -send_mail="$VESTA/web/inc/mail-wrapper.php" # Check load average -la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.') +la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') i=0 while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do echo "$(date "+%F %T") LoadAverage $la is above threshold. Sleeping..." @@ -67,20 +66,20 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do if [ "$i" -ge "5" ]; then mail_top=$(top -b| head -n 30) mail_text="LoadAverage $i is above threshold\n\n$mail_top\n" - echo -e "$mail_text" | $send_mail -s "$subj" $email + echo -e "$mail_text" |$send_mail -s "$subj" $email echo "Error: LA is too high" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_LA" "$EVENT" exit $E_LA fi - la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.') + la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') (( ++i)) done # Creating temporary directory tmpdir=$(mktemp -p $BACKUP -d) if [ "$?" -ne 0 ]; then - echo "Can't create tmp dir $tmpdir" | $send_mail -s "$subj" $email + echo "Can't create tmp dir $tmpdir" |$send_mail -s "$subj" $email echo "Error: can't create tmp dir" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST @@ -137,15 +136,15 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then # Parsing domain exclusions conf="$USER_DATA/web.conf" for domain in $(search_objects 'web' 'SUSPENDED' "*" 'DOMAIN'); do - check_exl=$(echo -e "${WEB//,/\n}" |grep "^$domain$") - if [ -z "$check_exl" ]; then + exclusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain$") + if [ -z "$exclusion" ]; then web_list="$web_list $domain" else echo "$(date "+%F %T") excluding $domain" msg="$msg\n$(date "+%F %T") excluding $domain" fi done - web_list=$(echo "$web_list" | sed -e "s/ */\ /g" -e "s/^ //") + web_list=$(echo "$web_list" |sed -e "s/ */\ /g" -e "s/^ //") i=0 @@ -212,11 +211,11 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then fargs+=(-not) fargs+=(-path) fargs+=("./logs*") - check_exlusion=$(echo -e "${WEB//,/\n}" | grep "^$domain:") - if [ ! -z "$check_exlusion" ]; then - xdirs="$(echo -e "${check_exlusion//:/\n}" |grep -v $domain)" + exlusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain:") + if [ ! -z "$exlusion" ]; then + xdirs="$(echo -e "$exlusion" |tr ':' '\n' |grep -v $domain)" for xpath in $xdirs; do - xpath="$(echo $xpath | sed -e 's/\/*$//' -e 's/^\/*//')" + xpath="$(echo $xpath |sed -e 's/\/*$//' -e 's/^\/*//')" fargs+=(-not) fargs+=(-path) fargs+=("./$xpath/*") @@ -259,15 +258,15 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS" != '*' ]; then # Parsing domain exclusions for domain in $(search_objects 'dns' 'SUSPENDED' "*" 'DOMAIN'); do - check_exl=$(echo -e "${DNS//,/\n}" |grep "^$domain$") - if [ -z "$check_exl" ]; then + exclusion=$(echo "$DNS" |tr ',' '\n' |grep "^$domain$") + if [ -z "$exclusion" ]; then dns_list="$dns_list $domain" else echo "$(date "+%F %T") excluding $domain" msg="$msg\n$(date "+%F %T") excluding $domain" fi done - dns_list=$(echo "$dns_list" | sed -e "s/ */\ /g" -e "s/^ //") + dns_list=$(echo "$dns_list" |sed -e "s/ */\ /g" -e "s/^ //") i=0 for domain in $dns_list; do @@ -312,7 +311,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then # Parsing domain exclusions conf="$USER_DATA/mail.conf" for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do - check_exl=$(echo -e "${MAIL//,/\n}" |grep "^$domain$") + check_exl=$(echo "$MAIL" |tr ',' '\n' |grep "^$domain$") if [ -z "$check_exl" ]; then mail_list="$mail_list $domain" else @@ -320,7 +319,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then msg="$msg\n$(date "+%F %T") excluding $domain" fi done - mail_list=$(echo "$mail_list" | sed -e "s/ */\ /g" -e "s/^ //") + mail_list=$(echo "$mail_list" |sed -e "s/ */\ /g" -e "s/^ //") i=0 for domain in $mail_list; do @@ -348,8 +347,8 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then # Backup emails cd $HOMEDIR/$user/mail/$domain_idn for account in $(ls); do - exclusion=$(echo -e "${MAIL//,/\n}" |grep "$domain:") - exclusion=$(echo -e "${exclusion//:/\n}" |grep "^$account$") + exclusion=$(echo "$MAIL" |tr ',' '\n' |grep "$domain:") + exclusion=$(echo "$exclusion" |tr ':' '\n' |grep "^$account$") # Checking exlusions if [ -z "$exclusion" ] && [[ "$MAIL_SYSTEM" =~ exim ]]; then @@ -390,8 +389,8 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then # Parsing database exclusions for database in $(search_objects 'db' 'SUSPENDED' "*" 'DB'); do - check_exl=$(echo -e "${DB//,/\n}" |grep "^$database$") - if [ -z "$check_exl" ]; then + exclusion=$(echo "$DB" |tr ',' '\n' |grep "^$database$") + if [ -z "$exclusion" ]; then db_list="$db_list $database" else echo "$(date "+%F %T") excluding $database" @@ -401,7 +400,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then i=0 conf="$USER_DATA/db.conf" - db_list=$(echo "$db_list" | sed -e "s/ */\ /g" -e "s/^ //") + db_list=$(echo "$db_list" |sed -e "s/ */\ /g" -e "s/^ //") for database in $db_list; do ((i ++)) get_database_values @@ -477,9 +476,8 @@ if [ "$USER" != '*' ]; then if [ -e "$USER_DATA/backup-excludes.conf" ]; then source $USER_DATA/backup-excludes.conf fi - exlusion_list=$(echo -e "${USER//,/\n}") fargs=() - for xpath in $exlusion_list; do + for xpath in $(echo "$USER" |tr ',' '\n'); do fargs+=(-not) fargs+=(-path) fargs+=("./$xpath*") @@ -491,12 +489,12 @@ if [ "$USER" != '*' ]; then set -f i=0 for udir in $(ls -a |egrep -v "conf|web|dns|mail|^\.\.$|^\.$"); do - check_exl=$(echo -e "${USER//,/\n}" |grep "^$udir$") - if [ -z "$check_exl" ]; then + exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$") + if [ -z "$exclusion" ]; then ((i ++)) udir_list="$udir_list $udir" - echo -e "$(date "+%F %T") adding directory $udir" - msg="$msg\n$(date "+%F %T") adding directory $udir" + echo -e "$(date "+%F %T") adding $udir" + msg="$msg\n$(date "+%F %T") adding $udir" # Backup files find ./$udir ${fargs[@]} -type f -or -type l -print0 |\ @@ -511,7 +509,7 @@ if [ "$USER" != '*' ]; then fi done set +f - udir_list=$(echo "$udir_list" | sed -e "s/ */\ /g" -e "s/^ //") + udir_list=$(echo "$udir_list" |sed -e "s/ */\ /g" -e "s/^ //") # Print total if [ "$i" -eq 1 ]; then @@ -526,7 +524,7 @@ if [ "$USER" != '*' ]; then fi # Get backup size -size="$(du -shm $tmpdir | cut -f 1)" +size="$(du -shm $tmpdir |cut -f 1)" # Get current time end_time=$(date '+%s') @@ -540,15 +538,15 @@ local_backup(){ rm -f $BACKUP/$user.$DATE.tar # Checking retention - backup_list=$(ls -lrt $BACKUP/ | awk '{print $9}' |grep "^$user\.") - backups_count=$(echo "$backup_list" | wc -l) + backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\.") + backups_count=$(echo "$backup_list" |wc -l) if [ "$BACKUPS" -le "$backups_count" ]; then backups_rm_number=$((backups_count - BACKUPS)) (( ++backups_rm_number)) # Removing old backup - for backup in $(echo "$backup_list" | head -n $backups_rm_number); do - backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") + for backup in $(echo "$backup_list" |head -n $backups_rm_number); do + backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") echo -e "$(date "+%F %T") Roated: $backup_date" msg="$msg\n$(date "+%F %T") Rotated: $backup_date" rm -f $BACKUP/$backup @@ -576,7 +574,7 @@ local_backup(){ localbackup='yes' echo -e "$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar" msg="$msg\n$(date "+%F %T") Local: $BACKUP/$user.$DATE.tar" - U_BACKUPS=$(ls $BACKUP/ | grep "^$user." | wc -l) + U_BACKUPS=$(ls $BACKUP/ |grep "^$user." |wc -l) update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" } @@ -599,7 +597,7 @@ ftp_backup() { # Checking config if [ ! -e "$VESTA/conf/ftp.backup.conf" ]; then ftp_conf_error="Can't open $VESTA/conf/ftp.backup.conf" - echo "$ftp_conf_error" | $send_mail -s "$subj" $email + echo "$ftp_conf_error" |$send_mail -s "$subj" $email echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_NOTEXIST" "$EVENT" @@ -663,11 +661,11 @@ ftp_backup() { # Checking retention backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.") - backups_count=$(echo "$backup_list" | wc -l) + backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then backups_rm_number=$((backups_count - BACKUPS + 1)) - for backup in $(echo "$backup_list" | head -n $backups_rm_number); do - backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") + for backup in $(echo "$backup_list" |head -n $backups_rm_number); do + backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") echo -e "$(date "+%F %T") Roated ftp backup: $backup_date" msg="$msg\n$(date "+%F %T") Roated ftp backup: $backup_date" ftpc "cd $BPATH" "delete $backup" @@ -750,7 +748,7 @@ sftp_backup() { # Checking config if [ ! -e "$VESTA/conf/sftp.backup.conf" ]; then sftp_conf_error="Can't open $VESTA/conf/sftp.backup.conf" - echo "$sftp_conf_error" | $send_mail -s "$subj" $email + echo "$sftp_conf_error" |$send_mail -s "$subj" $email echo "Error: $VESTA/conf/sftp.backup.conf doesn't exist" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_NOTEXIST" "$EVENT" @@ -803,11 +801,11 @@ sftp_backup() { # Checking retention backup_list=$(sftpc "cd $BPATH" "ls -l" |awk '{print $9}' |grep "^$user\.") - backups_count=$(echo "$backup_list" | wc -l) + backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then backups_rm_number=$((backups_count - BACKUPS + 1)) - for backup in $(echo "$backup_list" | head -n $backups_rm_number); do - backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar.*$//") + for backup in $(echo "$backup_list" |head -n $backups_rm_number); do + backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//") echo -e "$(date "+%F %T") Roated sftp backup: $backup_date" msg="$msg\n$(date "+%F %T") Roated sftp backup: $backup_date" sftpc "cd $BPATH" "rm $backup" > /dev/null 2>&1 @@ -893,7 +891,7 @@ sed -i "/v-backup-user $user /d" $VESTA/data/queue/backup.pipe if [ "$notify" != 'no' ]; then subj="$user → backup has been completed" email=$(get_user_value '$CONTACT') - echo -e "$msg" | $send_mail -s "$subj" $email + echo -e "$msg" |$send_mail -s "$subj" $email fi # Logging diff --git a/bin/v-change-database-host-password b/bin/v-change-database-host-password index 9c0c037ad..d5d37ea1d 100755 --- a/bin/v-change-database-host-password +++ b/bin/v-change-database-host-password @@ -13,17 +13,13 @@ type=$1 host=$2 dbuser=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-database-password b/bin/v-change-database-password index 152791902..29c41af82 100755 --- a/bin/v-change-database-password +++ b/bin/v-change-database-password @@ -13,17 +13,13 @@ # Argument defenition user=$1 database=$2 -password=$3 +password=$3; HIDE=3 # Includes source $VESTA/func/main.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -# Hiding password -A3='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-database-user b/bin/v-change-database-user index 90262d454..77c8ef975 100755 --- a/bin/v-change-database-user +++ b/bin/v-change-database-user @@ -13,7 +13,7 @@ user=$1 database=$2 dbuser="$user"_"$3" -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh @@ -21,10 +21,6 @@ source $VESTA/func/db.sh source $VESTA/func/rebuild.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 143468971..11afb34b5 100755 --- a/bin/v-change-mail-account-password +++ b/bin/v-change-mail-account-password @@ -15,17 +15,13 @@ domain=$(idn -t --quiet -u "$2" ) domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") account=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-user-password b/bin/v-change-user-password index 903224d7b..ce38cb533 100755 --- a/bin/v-change-user-password +++ b/bin/v-change-user-password @@ -11,16 +11,12 @@ # Argument defenition user=$1 -password=$2 +password=$2; HIDE=2 # Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -# Hiding password -A2="******" -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-web-domain-ftp-password b/bin/v-change-web-domain-ftp-password index e01b250ff..8d38fbb46 100755 --- a/bin/v-change-web-domain-ftp-password +++ b/bin/v-change-web-domain-ftp-password @@ -14,17 +14,13 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ftp_user=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4="******" -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - #----------------------------------------------------------# # Verifications # diff --git a/bin/v-change-web-domain-httpauth b/bin/v-change-web-domain-httpauth index 00deee1e0..9996c0988 100755 --- a/bin/v-change-web-domain-httpauth +++ b/bin/v-change-web-domain-httpauth @@ -13,17 +13,13 @@ user=$1 domain=$2 auth_user=$3 -password=$4 +password=$4; HIDE=4 # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf -# Hiding password -A4='******' -EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" - # Definining htpasswd file htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"