diff --git a/bin/v_add_db_base b/bin/v_add_db_base index c8cadf561..40198c4df 100755 --- a/bin/v_add_db_base +++ b/bin/v_add_db_base @@ -83,8 +83,7 @@ v_str="$v_str U_DISK='0' SUSPEND='no' DATE='$V_DATE'" echo "$v_str">>$V_USERS/$user/db.conf # Hiding password -dt="$(date +%m-%d-%y" "%H:%M:%S)" -V_EVENT="$dt $V_SCRIPT $user $database $db_user ***** $type $host" +V_EVENT="$V_DATE $V_SCRIPT $user $database $db_user ***** $type $host" # Logging log_history "$V_EVENT" "v_del_db_base $user $database" diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index 44341447b..182f24472 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -11,7 +11,7 @@ domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ip=$3 template=${4-default} -next_year=$(date +%m-%d-%y -d "+ 1 year") +next_year=$(date +F -d "+ 1 year") exp=${5-$next_year} soa=$6 ttl=${7-14400} diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index 590bac6e4..50507cc19 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -146,8 +146,7 @@ U_MAIL_DOMAINS='0' DATE='$V_DATE'" > $V_USERS/$user/user.conf # Hiding password -dt="$(date +%m-%d-%y" "%H:%M:%S)" -V_EVENT="$dt $V_SCRIPT $user ***** $email $package $fname $lname" +V_EVENT="$V_DATE $V_SCRIPT $user ***** $email $package $fname $lname" # Logging log_event 'system' "$V_EVENT" diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth index 674557490..4520e70cd 100755 --- a/bin/v_add_web_domain_stat_auth +++ b/bin/v_add_web_domain_stat_auth @@ -91,7 +91,7 @@ fi update_web_domain_value '$STATS_AUTH' "$a_users" # Hiding password -V_EVENT="$(date +%m-%d-%y" "%H:%M:%S) $V_SCRIPT $user $domain $auth_user *****" +V_EVENT="$V_DATE $V_SCRIPT $user $domain $auth_user *****" # Logging log_history "$V_EVENT" "v_del_web_domain_stat_auth $user $domain $auth_user" diff --git a/bin/v_backup_sys_user b/bin/v_backup_sys_user index b7422295b..058369932 100755 --- a/bin/v_backup_sys_user +++ b/bin/v_backup_sys_user @@ -7,7 +7,6 @@ # Argument defenition user=$1 -output=$2 # Importing variables source $VESTA/conf/vars.conf @@ -22,7 +21,7 @@ source $V_FUNC/db.func #----------------------------------------------------------# # Checking arg number -check_args '1' "$#" 'user [output]' +check_args '1' "$#" 'user' # Checking argument format format_validation 'user' @@ -40,10 +39,8 @@ is_backup_enabled la=$(cat /proc/loadavg |cut -f 1 -d ' '|cut -f 1 -d '.') i=0 while [ "$la" -ge "$V_BACKUP_LA_LIMIT" ]; do - if [ -z "$output" ]; then - echo "$(date +%m-%d-%y" "%H:%M:%S) Load Average $la" - echo - fi + echo "$(date "+%F %T") Load Average $la" + echo sleep 60 @@ -65,14 +62,12 @@ done start_time=$(date '+%s') # Creating temporary random directory -tmpdir=$(mktemp -p $V_TMP -d) +tmpdir=$(mktemp -p $V_BACKUP -d) # Prinitng status -if [ -z "$output" ]; then - echo "$(date +%m-%d-%y" "%H:%M:%S) System backup for user $user" - echo "TMPDIR is $tmpdir" - echo -fi +echo "$(date "+%F %T") System backup for user $user" +echo "TMPDIR is $tmpdir" +echo # Addding backup and vesta version echo "1.0" > $tmpdir/backup_version @@ -81,127 +76,87 @@ echo "$VERSION" > $tmpdir/vesta_version # Vesta -if [ -z "$output" ]; then - echo "-- VESTA --" -fi +echo "-- VESTA --" vst='yes' mkdir $tmpdir/vesta # Backingup vesta configs -if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) user.conf" -fi +echo -e "$(date "+%F %T") user.conf" + cp -r $V_USERS/$user/user.conf $tmpdir/vesta/ if [ -e "$V_USERS/$user/billing.log" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) billing.log" - fi + echo -e "$(date "+%F %T") billing.log" cp -r $V_USERS/$user/billing.log $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/history.log" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) history.log" - fi - + echo -e "$(date "+%F %T") history.log" cp -r $V_USERS/$user/history.log $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/backup.excludes" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) backup.excludes" - fi + echo -e "$(date "+%F %T") backup.excludes" cp -r $V_USERS/$user/backup.excludes $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/cron.conf" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) cron.conf" - fi + echo -e "$(date "+%F %T") cron.conf" cp -r $V_USERS/$user/cron.conf $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/db.conf" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) db.conf" - fi + echo -e "$(date "+%F %T") db.conf" cp -r $V_USERS/$user/db.conf $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/dns.conf" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) dns.conf" - fi + echo -e "$(date "+%F %T") dns.conf" cp -r $V_USERS/$user/dns.conf $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/mail.conf" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) mail.conf" - fi + echo -e "$(date "+%F %T") mail.conf" cp -r $V_USERS/$user/mail.conf $tmpdir/vesta/ fi if [ -e "$V_USERS/$user/web.conf" ]; then - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) web.conf" - fi + echo -e "$(date "+%F %T") web.conf" cp -r $V_USERS/$user/web.conf $tmpdir/vesta/ fi - -if [ -z "$output" ]; then - echo -fi +echo # PAM -if [ -z "$output" ]; then - echo "-- PAM --" -fi +echo "-- PAM --" pam='yes' mkdir $tmpdir/pam -if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) passwd / shadow /group" -fi - +echo -e "$(date "+%F %T") passwd / shadow /group" grep "^$user:" /etc/passwd > $tmpdir/pam/passwd grep "^$user:" /etc/shadow > $tmpdir/pam/shadow grep "^$user:" /etc/group > $tmpdir/pam/group - -if [ -z "$output" ]; then - echo -fi +echo # Checking excludes OLD_IFS="$IFS" IFS=$'\n' if [ -e "$V_USERS/$user/backup.excludes" ]; then - if [ -z "$output" ]; then - echo "-- Excludes --" - fi + echo "-- Excludes --" for exclude in $(cat $V_USERS/$user/backup.excludes); do - if [ -z "$output" ]; then - echo -e "\t$exclude" - fi + echo -e "$exclude" # Indirect variable references (a bit of black magic) eval ${exclude%%=*}=${exclude#*=} done - - if [ -z "$output" ]; then - echo - fi + echo fi IFS="$OLD_IFS" # WEB domains if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ] && [ "$WEB" != '*' ] then - if [ -z "$output" ]; then - echo "-- WEB --" - fi + echo "-- WEB --" mkdir $tmpdir/web/ # Parsing unsuspeneded domains @@ -221,10 +176,7 @@ then web_list=$(echo "$web_list" | sed -e "s/ */\ /g" -e "s/^ //") for domain in $web_list; do - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) $domain" - fi - + echo -e "$(date "+%F %T") $domain" # Building directory tree mkdir -p $tmpdir/web/$domain/conf mkdir -p $tmpdir/web/$domain/ssl @@ -296,18 +248,13 @@ then fi done - if [ -z "$output" ]; then - echo - fi - + echo fi # DNS domains if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ] && [ "$DNS" != '*' ] then - if [ -z "$output" ]; then - echo "-- DNS --" - fi + echo "-- DNS --" mkdir $tmpdir/dns/ # Parsing unsuspeneded domains @@ -326,10 +273,7 @@ then dns_list=$(echo "$dns_list" | sed -e "s/ */\ /g" -e "s/^ //") for domain in $dns_list; do - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) $domain" - fi - + echo -e "$(date "+%F %T") $domain" # Building directory tree mkdir $tmpdir/dns/$domain @@ -342,10 +286,7 @@ then cp $V_USERS/$user/dns/$domain $domain cp /etc/namedb/$domain.db $domain.db done - - if [ -z "$output" ]; then - echo - fi + echo fi @@ -354,9 +295,7 @@ fi # DatbaBases if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ] && [ "$DB" != '*' ]; then - if [ -z "$output" ]; then - echo "-- DB --" - fi + echo "-- DB --" mkdir $tmpdir/db/ # Parsing unsuspeneded domains @@ -381,9 +320,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ] && [ "$DB" != '*' ]; then dump="$tmpdir/db/$database.$type.sql" grants="$tmpdir/db/$database.$type.$db_user" - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) $database $type" - fi + echo -e "$(date "+%F %T") $database $type" case $type in mysql) dump_db_mysql ;; @@ -395,46 +332,30 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ] && [ "$DB" != '*' ]; then fi done - - if [ -z "$output" ]; then - echo - fi + echo fi # Cron jobs if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ] && [ "$CRON" != '*' ] then - if [ -z "$output" ]; then - echo "-- CRON --" - fi + echo "-- CRON --" mkdir $tmpdir/cron/ # Backingup cron recods - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) cron.conf" - fi + echo -e "$(date "+%F %T") cron.conf" cp $V_USERS/$user/cron.conf $tmpdir/cron/ - - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) system cron" - fi + echo -e "$(date "+%F %T") system cron" if [ -e "/var/spool/cron/$user" ]; then cron_list='yes' cp /var/spool/cron/$user $tmpdir/cron/ fi - - if [ -z "$output" ]; then - echo - fi - + echo fi # SSL CERTIFICATES if [ ! -z "$WEB_SSL" ] && [ "$WEB_SSL" != 'no' ] && [ "$SSL" != '*' ]; then - if [ -z "$output" ]; then - echo "-- SSL --" - fi + echo "-- SSL --" mkdir $tmpdir/ssl # Backingup ssl certificates @@ -443,16 +364,10 @@ if [ ! -z "$WEB_SSL" ] && [ "$WEB_SSL" != 'no' ] && [ "$SSL" != '*' ]; then tr '\n' ' ' |\ sed -e 's/ $//' ) for cert in $cert_list; do - if [ -z "$output" ]; then - echo -e "\t$(date +%H:%M:%S) $cert" - fi + echo -e "$(date "+%F %T") $cert" cp $V_USERS/$user/ssl/$cert.* $tmpdir/ssl/ done - - if [ -z "$output" ]; then - echo - fi - + echo fi # Get backup size @@ -463,15 +378,13 @@ end_time=$(date '+%s') # Defining local storage function local_backup(){ - if [ -z "$output" ]; then - echo "-- STORAGE --" - echo -e "\t$(date +%H:%M:%S) ARCHIVE $V_BACKUP/$user.$V_DATE.tar" - fi + echo "-- STORAGE --" + echo -e "$(date "+%F %T") ARCHIVE $V_BACKUP/$user.$V_DATE.tar" # Removing dublicate for this day if [ -e "$V_BACKUP/$user.$V_DATE.tar" ]; then deprecated="$V_DATE" - echo -e "\tDeleting old backup for $V_DATE" + echo -e "Deleting old backup for $V_DATE" rm -f $V_BACKUP/$user.$V_DATE.tar fi @@ -487,9 +400,7 @@ local_backup(){ # Removing old backup backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") deprecated="$deprecated $backup_date" - if [ -z "$output" ]; then - echo -e "\tDeleteing old backup for $backup_date" - fi + echo -e "\tDeleteing old backup for $backup_date" rm -f $V_BACKUP/$backup done fi @@ -507,12 +418,8 @@ local_backup(){ tar -cf $V_BACKUP/$user.$V_DATE.tar . chmod 640 $V_BACKUP/$user.$V_DATE.tar chown root:$user $V_BACKUP/$user.$V_DATE.tar - localbackup='yes' - - if [ -z "$output" ]; then - echo - fi + echo } @@ -530,9 +437,7 @@ EOF # Defining ftp storage function ftp_backup(){ - if [ -z "$output" ]; then - echo "-- FTP --" - fi + echo "-- FTP --" # Checking config source $V_CONF/ftp.backup.conf @@ -544,10 +449,8 @@ ftp_backup(){ fi # Debug info - if [ -z "$output" ]; then - echo -ne "\t$(date +%H:%M:%S) " - echo -e "ftp://$USERNAME@$HOST$BPATH/$user.$V_DATE.tar" - fi + echo -ne "$(date "+%F %T") " + echo -e "ftp://$USERNAME@$HOST$BPATH/$user.$V_DATE.tar" # Checking ftp permission ftmpdir=$(mktemp -u -p $BPATH) @@ -565,12 +468,10 @@ ftp_backup(){ 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" | tail -n $backups_rm_number); do + for backup in $(echo "$backup_list" | head -n $backups_rm_number); do backup_date=$(echo $backup | sed -e "s/$user.//" -e "s/.tar$//") deprecated="$deprecated $backup" - if [ -z "$output" ]; then - echo -e "\tDeleteing old backup for $backup_date" - fi + echo -e "\tDeleteing old backup for $backup_date" ftpc "delete $backup" done fi @@ -581,15 +482,12 @@ ftp_backup(){ ftpc "put $user.$V_DATE.tar" else cd $tmpdir - tar -cf $V_TMP/$user.$V_DATE.tar . - cd $V_TMP/ + tar -cf $V_BACKUP/$user.$V_DATE.tar . + cd $V_BACKUP/ ftpc "put $user.$V_DATE.tar" rm -f $user.$V_DATE.tar fi - - if [ -z "$output" ]; then - echo - fi + echo } # Switching on backup system types @@ -607,21 +505,18 @@ rm -rf $tmpdir # Calculation run time run_time=$((end_time - start_time)) run_time=$((run_time / 60)) -current_time=$(date +'%H:%M:%S') +current_time=$(date "+%T") if [ "$run_time" -lt 1 ]; then run_time=1 fi -if [ -z "$output" ]; then - min=miutes - if [ "$run_time" -eq 1 ]; then - min=minute - fi - echo "$(date +'%m-%d-%y %H:%M:%S') Backup took $run_time $min" - echo - echo +min=miutes +if [ "$run_time" -eq 1 ]; then + min=minute fi - +echo "$(date "+%F %T") Backup took $run_time $min" +echo +echo #----------------------------------------------------------# diff --git a/bin/v_change_db_password b/bin/v_change_db_password index 9e7dabdad..10bd6ce25 100755 --- a/bin/v_change_db_password +++ b/bin/v_change_db_password @@ -64,7 +64,7 @@ esac #----------------------------------------------------------# # Hiding password -V_EVENT="$(date +%m-%d-%y" "%H:%M:%S) $V_SCRIPT $user $database *****" +V_EVENT="$V_DATE $V_SCRIPT $user $database *****" # Logging log_event 'system' "$V_EVENT" diff --git a/bin/v_change_sys_user_password b/bin/v_change_sys_user_password index a0fde1d5b..f40aaa06e 100755 --- a/bin/v_change_sys_user_password +++ b/bin/v_change_sys_user_password @@ -45,7 +45,7 @@ echo "$password" | /usr/bin/passwd "$user" --stdin >/dev/null 2>&1 #----------------------------------------------------------# # Hiding password -V_EVENT="$(date +%m-%d-%y" "%H:%M:%S) $V_SCRIPT $user *****" +V_EVENT="$V_DATE $V_SCRIPT $user *****" # Logging log_event 'system' "$V_EVENT" diff --git a/bin/v_check_sys_user_password b/bin/v_check_sys_user_password index 8affd6b9d..7cfdd0403 100755 Binary files a/bin/v_check_sys_user_password and b/bin/v_check_sys_user_password differ diff --git a/bin/v_list_sys_user_backups b/bin/v_list_sys_user_backups index 8a5e365f6..857526e36 100755 --- a/bin/v_list_sys_user_backups +++ b/bin/v_list_sys_user_backups @@ -39,7 +39,7 @@ fi # Defining fileds to select fields="\$DATE \$TIME \$RUNTIME \$TYPE \$SIZE \$VESTA \$PAM \$WEB \$DNS \$DB" -fields="$fields \$MAIL \$CERTIFICATES \$CRON" +fields="$fields \$MAIL \$SSL \$CRON" # Listing domains case $format in diff --git a/bin/v_upd_sys_user_backups b/bin/v_upd_sys_user_backups index 56e197ea0..0147702e3 100755 --- a/bin/v_upd_sys_user_backups +++ b/bin/v_upd_sys_user_backups @@ -222,7 +222,7 @@ fi # Checking ftp if [ "$type" == 'ftp' ]; then - tmpdir=$(mktemp -p $V_TMP -d) + tmpdir=$(mktemp -p $V_BACKUP -d) ftmpdir=$(basename $tmpdir) init_ftp_variables check_ftp_connection @@ -244,7 +244,7 @@ fi # Checking both local and ftp if [ "$type" == 'ftp,local' ] || [ "$type" == 'local,ftp' ]; then - tmpdir=$(mktemp -p $V_TMP -d) + tmpdir=$(mktemp -p $V_BACKUP -d) ftmpdir=$(basename $tmpdir) init_ftp_variables check_ftp_connection @@ -279,6 +279,9 @@ fi if [ -e "$tmp_file" ]; then cat $tmp_file | sort > $V_USERS/$user/backup.conf rm $tmp_file +else + rm $V_USERS/$user/backup.conf + touch $V_USERS/$user/backup.conf fi diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill index 0b957f39b..bdcf05968 100755 --- a/bin/v_upd_sys_user_bill +++ b/bin/v_upd_sys_user_bill @@ -106,7 +106,7 @@ for user in $user_list; do source $V_USERS/$user/user.conf # Redefining date - DATE=$(date -d "$(date +'%m/01') -1day" +%m-%d-%y) + DATE=$(date -d "$(date +'%m/01') -1day" +%F) # Compiling report string v_str="DATE='$DATE' PACKAGE='$PACKAGE'" diff --git a/src/v_check_sys_user_password.c b/src/v_check_sys_user_password.c index 74105edb7..1597b61d8 100755 --- a/src/v_check_sys_user_password.c +++ b/src/v_check_sys_user_password.c @@ -41,7 +41,7 @@ int main (int argc, char** argv) { time_t lt = time(NULL); struct tm* ptr = localtime(<); char str[280]; - strftime(str, 100, "%m-%d-%y %H:%m:%S ", ptr); + strftime(str, 100, "%Y-%m-%d %H:%M:%S ", ptr); // openning log file FILE* pFile = fopen ("/usr/local/vesta/log/auth.log","a+");