github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 02:28:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactoring: log_event(), is_format_valid()

Browse source
This commit is contained in:
Serghey Rodin 2016-06-09 16:31:56 +03:00
commit e05dca61a6
211 changed files with 756 additions and 1091 deletions
Download patch file Download diff file Expand all files Collapse all files

30
bin/v-add-user-package
View file

@ -22,7 +22,7 @@ source $VESTA/conf/vesta.conf
is_package_new() {
if [ -e "$VESTA/data/packages/$package.pkg" ]; then
echo "Error: package $package already exists."
log_event "$E_EXISTS" "$EVENT"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi
}
@ -30,39 +30,39 @@ is_package_new() {
is_package_consistent() {
source $pkg_dir/$package.pkg
if [ "$WEB_DOMAINS" != 'unlimited' ]; then
validate_format_int $WEB_DOMAINS 'WEB_DOMAINS'
is_format_valid_int $WEB_DOMAINS 'WEB_DOMAINS'
fi
if [ "$WEB_ALIASES" != 'unlimited' ]; then
validate_format_int $WEB_ALIASES 'WEB_ALIASES'
is_format_valid_int $WEB_ALIASES 'WEB_ALIASES'
fi
if [ "$DNS_DOMAINS" != 'unlimited' ]; then
validate_format_int $DNS_DOMAINS 'DNS_DOMAINS'
is_format_valid_int $DNS_DOMAINS 'DNS_DOMAINS'
fi
if [ "$DNS_RECORDS" != 'unlimited' ]; then
validate_format_int $DNS_RECORDS 'DNS_RECORDS'
is_format_valid_int $DNS_RECORDS 'DNS_RECORDS'
fi
if [ "$MAIL_DOMAINS" != 'unlimited' ]; then
validate_format_int $MAIL_DOMAINS 'MAIL_DOMAINS'
is_format_valid_int $MAIL_DOMAINS 'MAIL_DOMAINS'
fi
if [ "$MAIL_ACCOUNTS" != 'unlimited' ]; then
validate_format_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS'
is_format_valid_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS'
fi
if [ "$DATABASES" != 'unlimited' ]; then
validate_format_int $DATABASES 'DATABASES'
is_format_valid_int $DATABASES 'DATABASES'
fi
if [ "$CRON_JOBS" != 'unlimited' ]; then
validate_format_int $CRON_JOBS 'CRON_JOBS'
is_format_valid_int $CRON_JOBS 'CRON_JOBS'
fi
if [ "$DISK_QUOTA" != 'unlimited' ]; then
validate_format_int $DISK_QUOTA 'DISK_QUOTA'
is_format_valid_int $DISK_QUOTA 'DISK_QUOTA'
fi
if [ "$BANDWIDTH" != 'unlimited' ]; then
validate_format_int $BANDWIDTH 'BANDWIDTH'
is_format_valid_int $BANDWIDTH 'BANDWIDTH'
fi
if [ "$BACKUPS" != 'unlimited' ]; then
validate_format_int $BACKUPS 'BACKUPS'
is_format_valid_int $BACKUPS 'BACKUPS'
fi
validate_format_shell $SHELL
is_format_valid_shell $SHELL
}
@ -71,7 +71,7 @@ is_package_consistent() {
#----------------------------------------------------------#
check_args '2' "$#" 'PKG_DIR PACKAGE' 'rewrite'
validate_format 'pkg_dir' 'package'
is_format_valid 'pkg_dir' 'package'
if [ "$rewrite" != 'yes' ]; then
is_package_new
fi
@ -97,6 +97,6 @@ if [ "$rewrite" != 'yes' ]; then
else
log_history "updated user package $package" '' 'admin'
fi
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit