replaced underscore with dash in api syscalls

This commit is contained in:
Serghey Rodin 2012-11-09 18:26:32 +02:00
parent 7ed705cee7
commit b6b7eacadb
283 changed files with 438 additions and 412 deletions

View file

@ -72,7 +72,7 @@ sync_cron_jobs
increase_user_value $user '$U_CRON_JOBS'
# Restart crond
$BIN/v_restart_cron "$EVENT"
$BIN/v-restart-cron "$EVENT"
# Logging
log_history "added cron job $job"

View file

@ -45,7 +45,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Restart crond
$BIN/v_restart_cron "$EVENT"
$BIN/v-restart-cron "$EVENT"
# Logging
log_history "enabled cron reporting"

View file

@ -3,7 +3,7 @@
# options: user database dbuser dbpass type [host] [charset]
#
# The function creates the database concatenating username and user_db.
# Supported yypes of databases you can get using v_list_sys_config script.
# Supported yypes of databases you can get using v-list-sys-config script.
# If the host isn't stated and there are few hosts configured on the server,
# then the host will be defined by one of three algorithms. "First" will choose
# the first host in the list. "Random" will chose the host by a chance.

View file

@ -133,7 +133,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records"
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
fi
# Logging

View file

@ -82,7 +82,7 @@ increase_user_value "$user" '$U_DNS_RECORDS'
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
fi
# Logging

View file

@ -49,15 +49,15 @@ get_domain_values 'web'
# Check if it a simple domain
if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
if [ ! -e "$USER_DATA/dns/$dom_alias.conf" ]; then
$BIN/v_add_dns_domain $user $dom_alias $IP '' '' '' '' '' $restart
$BIN/v-add-dns-domain $user $dom_alias $IP '' '' '' '' '' $restart
fi
else
# Check subdomain
sub=$(echo "$dom_alias" | cut -f1 -d . -s)
dom=$(echo "$dom_alias" | sed -e "s/^$sub.//" )
if [ ! -e "$USER_DATA/dns/$dom.conf" ]; then
$BIN/v_add_dns_domain $user $dom $IP '' '' '' '' '' $restart
$BIN/v_add_dns_domain_record $user $dom "$sub" A $IP '' '' $restart
$BIN/v-add-dns-domain $user $dom $IP '' '' '' '' '' $restart
$BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart
else
if [ "$sub" == '*' ]; then
rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$dom.conf)
@ -65,7 +65,7 @@ else
rec=$(grep -w "RECORD='$sub'" $USER_DATA/dns/$dom.conf)
fi
if [ -z "$rec" ]; then
$BIN/v_add_dns_domain_record $user $dom "$sub" A $IP '' '' $restart
$BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart
fi
fi
fi

View file

@ -85,11 +85,11 @@ if [ "$dkim" = 'yes' ]; then
p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
record='_domainkey'
policy="\"t=y; o=~;\""
$BIN/v_add_dns_domain_record $user $domain $record TXT "$policy"
$BIN/v-add-dns-domain-record $user $domain $record TXT "$policy"
record='mail._domainkey'
selector="\"k=rsa\; p=$p\""
$BIN/v_add_dns_domain_record $user $domain $record TXT "$selector"
$BIN/v-add-dns-domain-record $user $domain $record TXT "$selector"
fi
fi

View file

@ -58,11 +58,11 @@ if [ "$?" -eq 0 ]; then
p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
record='_domainkey'
policy="\"t=y; o=~;\""
$BIN/v_add_dns_domain_record $user $domain $record TXT "$policy"
$BIN/v-add-dns-domain-record $user $domain $record TXT "$policy"
record='mail._domainkey'
selector="\"k=rsa\; p=$p\""
$BIN/v_add_dns_domain_record $user $domain $record TXT "$selector"
$BIN/v-add-dns-domain-record $user $domain $record TXT "$selector"
fi

View file

@ -90,7 +90,7 @@ fi
# Restart web server
if [ "$web_restart" = 'yes' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -99,7 +99,7 @@ chmod a+x $HOMEDIR/$user
# Checking quota
if [ ! -z "$DISK_QUOTA" ] && [ "$DISK_QUOTA" != 'no' ]; then
DISK_QUOTA=$(echo "$pkg_data" | grep 'DISK_QUOTA' | cut -f 2 -d \')
#$BIN/v_add_user_quota "$user" "$DISK_QUOTA"
#$BIN/v-add-user_quota "$user" "$DISK_QUOTA"
fi
@ -119,16 +119,16 @@ chmod 660 $USER_DATA/history.log
touch $USER_DATA/stats.log
chmod 660 $USER_DATA/stats.log
echo "v_update_user_disk $user" >> $VESTA/data/queue/disk.pipe
echo "v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
mkdir $USER_DATA/ssl
chmod 770 $USER_DATA/ssl
touch $USER_DATA/web.conf
chmod 660 $USER_DATA/web.conf
echo "$BIN/v_update_web_domains_traff $user" \
echo "$BIN/v-update-web-domains-traff $user" \
>> $VESTA/data/queue/traffic.pipe
echo "v_update_web_domains_disk $user" >> $VESTA/data/queue/disk.pipe
echo "v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe
fi
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
@ -143,13 +143,13 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
chmod 770 $USER_DATA/mail
touch $USER_DATA/mail.conf
chmod 660 $USER_DATA/mail.conf
echo "v_update_mail_domains_disk $user" >> $VESTA/data/queue/disk.pipe
echo "v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe
fi
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
touch $USER_DATA/db.conf
chmod 660 $USER_DATA/db.conf
echo "v_update_databases_disk $user" >> $VESTA/data/queue/disk.pipe
echo "v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe
fi
if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
@ -159,7 +159,7 @@ fi
# Filling user config
if [ "$user" != 'admin' ]; then
ip_avail=$($BIN/v_list_user_ips admin plain |grep -w shared|wc -l)
ip_avail=$($BIN/v-list-user-ips admin plain |grep -w shared|wc -l)
u_users=0
else
ip_avail=0

View file

@ -180,7 +180,7 @@ chmod 660 $USER_DATA/web.conf
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -100,7 +100,7 @@ increase_user_value "$user" '$U_WEB_ALIASES'
# Adding task to the vesta pipe
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
log_history "added $dom_alias as alias for $domain"

View file

@ -71,7 +71,7 @@ fi
update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'yes'
# Restart web server
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
# Logging
log_history "enabled cgi support for $domain"

View file

@ -89,7 +89,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ELOG' 'yes'
# Adding task to the vesta pipe
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -101,7 +101,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$NGINX_EXT' "$extentions"
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
log_history "enabled nginx support for $domain"

View file

@ -126,7 +126,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -6,7 +6,7 @@
# two types of these system is supported - awstats and webalizer. For viewing
# the domain statistics use http://domain.tld/vstats/ link. Access this page
# is not protected by default. If you want to secure it with passwords you
# should use v_add_web_domain_stat_auth script.
# should use v-add-web-domain_stat_auth script.
#----------------------------------------------------------#
@ -71,7 +71,7 @@ cat $WEBTPL/$type.tpl |\
#----------------------------------------------------------#
# Schedule statistic processing
echo "$BIN/v_update_web_domain_stat $user $domain" >> \
echo "$BIN/v-update-web-domain-stat $user $domain" >> \
$VESTA/data/queue/webstats.pipe
# Update config
@ -82,6 +82,6 @@ log_history "enabled web log analyzer for $domain"
log_event "$OK" "$EVENT"
# Build stats
exec $BIN/v_update_web_domain_stat $user $domain
exec $BIN/v-update-web-domain-stat $user $domain
exit

View file

@ -25,7 +25,7 @@ source $VESTA/func/main.sh
for user in $(ls $VESTA/data/users); do
check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
if [ ! -z "$check_suspend" ]; then
$BIN/v_backup_user $user >> $VESTA/log/backup.log 2>&1
$BIN/v-backup-user $user >> $VESTA/log/backup.log 2>&1
fi
done

View file

@ -64,7 +64,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Restart crond
$BIN/v_restart_cron "$EVENT"
$BIN/v-restart-cron "$EVENT"
# Logging
log_history "changed cron job $job"

View file

@ -55,7 +55,7 @@ update_domain_zone
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
fi
# Logging

View file

@ -68,7 +68,7 @@ update_domain_zone
#----------------------------------------------------------#
# Restart named
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
# Logging
log_history "changed dns record on $domain to $dvalue"

View file

@ -3,7 +3,7 @@
# options: user domain soa
#
# The function for changing SOA record. This type of records can not be
# modified by v_change_dns_domain_record call.
# modified by v-change-dns-domain-record call.
#----------------------------------------------------------#
@ -53,7 +53,7 @@ update_domain_zone
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
fi
# Logging

View file

@ -75,7 +75,7 @@ update_domain_zone
#----------------------------------------------------------#
# Restart named
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
# Logging
log_history "changed dns template for $domain to $template" '' 'admin'

View file

@ -52,7 +52,7 @@ update_domain_zone
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
fi
# Logging

View file

@ -86,7 +86,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$ip"
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -91,7 +91,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$NGINX_EXT' "$extentions"
# Restart web
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -70,7 +70,7 @@ fi
#----------------------------------------------------------#
# Restart web server
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
# Logging
log_history "changed ssl certificate for $domain"

View file

@ -70,7 +70,7 @@ fi
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
# Restart web server
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
# Logging
log_history "changed ssl home for $domain to $ssl_home"

View file

@ -90,6 +90,6 @@ log_history "changed web log stats for $domain to $type"
log_event "$OK" "$EVENT"
# Build stats
exec $BIN/v_update_web_domain_stat $user $domain
exec $BIN/v-update-web-domain-stat $user $domain
exit

View file

@ -100,7 +100,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
# Restart web
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -53,7 +53,7 @@ sync_cron_jobs
decrease_user_value "$user" '$U_CRON_JOBS'
# Restart crond
$BIN/v_restart_cron "$EVENT"
$BIN/v-restart-cron "$EVENT"
# Logging
log_history "deleted cron job $job"

View file

@ -45,7 +45,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Restart crond
$BIN/v_restart_cron "$EVENT"
$BIN/v-restart-cron "$EVENT"
# Logging
log_history "disabled cron reporting"

View file

@ -34,7 +34,7 @@ is_object_unsuspended 'user' 'USER' "$user"
# Starting delete loop
for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do
$BIN/v_delete_database "$user" "$database"
$BIN/v-delete-database "$user" "$database"
done

View file

@ -59,7 +59,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
# Restart named
if [ "$restart" != 'no' ]; then
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
fi

View file

@ -55,7 +55,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
decrease_user_value "$user" '$U_DNS_RECORDS'
# Restart named
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
# Logging
log_history "deleted dns record $id on $domain"

View file

@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user"
# Starting delete loop
for domain in $(search_objects 'dns' 'SUSPENDED' "no" 'DOMAIN'); do
$BIN/v_delete_dns_domain "$user" "$domain" 'no'
$BIN/v-delete-dns-domain "$user" "$domain" 'no'
done
@ -42,7 +42,7 @@ done
#----------------------------------------------------------#
# Restart named
$BIN/v_restart_dns "$EVENT"
$BIN/v-restart-dns "$EVENT"
# Logging
log_event "$OK" "$EVENT"

View file

@ -49,7 +49,7 @@ get_domain_values 'web'
# Check if it a simple domain
if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then
if [ -e "$USER_DATA/dns/$dom_alias.conf" ]; then
$BIN/v_delete_dns_domain $user $dom_alias $IP $restart
$BIN/v-delete-dns-domain $user $dom_alias $IP $restart
fi
else
# Check subdomain
@ -63,7 +63,7 @@ else
fi
if [ ! -z "$rec" ]; then
eval "$rec"
$BIN/v_delete_dns_domain_record $user "$root" "$ID"
$BIN/v-delete-dns-domain-record $user "$root" "$ID"
fi
fi
fi

View file

@ -46,10 +46,10 @@ rm -f $HOMEDIR/$user/conf/mail/$domain/dkim.pem
# Checking dns domain
check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
if [ "$?" -eq 0 ]; then
records=$($BIN/v_list_dns_domain_records $user $domain plain)
records=$($BIN/v-list-dns-domain-records $user $domain plain)
dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ')
for id in $dkim_records; do
$BIN/v_delete_dns_domain_record $user $domain $id
$BIN/v-delete-dns-domain-record $user $domain $id
done
fi

View file

@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user"
# Starting delete loop
for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do
$BIN/v_delete_mail_domain "$user" "$domain"
$BIN/v-delete-mail-domain "$user" "$domain"
done

View file

@ -84,7 +84,7 @@ fi
# Adding task to the vesta pipe
if [ "$web_restart" = 'yes' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -40,8 +40,8 @@ fi
# Checking web system is enabled
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
$BIN/v_unsuspend_web_domains $user $restart
$BIN/v_delete_web_domains $user $restart
$BIN/v-unsuspend-web-domains $user $restart
$BIN/v-delete-web-domains $user $restart
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
@ -50,8 +50,8 @@ fi
# Checking dns system is enabled
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
$BIN/v_unsuspend_dns_domains $user $restart
$BIN/v_delete_dns_domains $user $restart
$BIN/v-unsuspend-dns-domains $user $restart
$BIN/v-delete-dns-domains $user $restart
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
@ -60,8 +60,8 @@ fi
# Checking mail system is enabled
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
$BIN/v_unsuspend_mail_domains $user
$BIN/v_delete_mail_domains $user
$BIN/v-unsuspend-mail-domains $user
$BIN/v-delete-mail-domains $user
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
@ -70,8 +70,8 @@ fi
# Checking db system is enabled
if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
$BIN/v_unsuspend_databases $user
$BIN/v_delete_databases $user
$BIN/v-unsuspend-databases $user
$BIN/v-delete-databases $user
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv
@ -79,7 +79,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
fi
# Checking ip
$BIN/v_delete_user_ips "$user"
$BIN/v-delete-user-ips "$user"
rv="$?"
if [ "$rv" -ne '0' ]; then
exit $rv

View file

@ -154,7 +154,7 @@ fi
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -98,7 +98,7 @@ decrease_user_value "$user" '$U_WEB_ALIASES'
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -70,7 +70,7 @@ fi
update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'no'
# Restart web server
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
# Logging
log_history "disabled cgi support for $domain"

View file

@ -87,7 +87,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ELOG' 'no'
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -77,7 +77,7 @@ fi
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -91,7 +91,7 @@ decrease_user_value "$user" '$U_WEB_SSL'
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

View file

@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user"
# Starting delete loop
for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do
$BIN/v_delete_web_domain "$user" "$domain" 'no'
$BIN/v-delete-web-domain "$user" "$domain" 'no'
done
@ -44,7 +44,7 @@ done
# Restart web server
if [ "$restart" != 'no' ]; then
$BIN/v_restart_web "$EVENT"
$BIN/v-restart-web "$EVENT"
fi
# Logging

Some files were not shown because too many files have changed in this diff Show more