github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-30 03:29:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

optimized shared function

Browse source
This commit is contained in:
Serghey Rodin 2012-02-22 00:39:44 +02:00
parent 965b2a4933
commit 44027136c4
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_add_db_host
View file

@ -75,7 +75,7 @@ esac
# Adding host to conf # Adding host to conf
echo "$new_str" >> $V_DB/$type.conf echo "$new_str" >> $V_DB/$type.conf
chmod 640 $V_DB/$type.conf chmod 660 $V_DB/$type.conf
#----------------------------------------------------------# #----------------------------------------------------------#

2
bin/v_add_web_domain
View file

@ -162,7 +162,7 @@ chown root:$user /var/log/httpd/domains/$domain.*
chown root:apache $conf chown root:apache $conf
# Changing file permissions # Changing file permissions
chmod 640 $conf chmod 660 $conf
chmod 551 $V_HOME/$user/web/$domain chmod 551 $V_HOME/$user/web/$domain
chmod 751 $V_HOME/$user/web/$domain/private chmod 751 $V_HOME/$user/web/$domain/private
chmod 751 $V_HOME/$user/web/$domain/cgi-bin chmod 751 $V_HOME/$user/web/$domain/cgi-bin

26
func/shared.func
View file

@ -319,7 +319,15 @@ format_validation() {
fi fi
} }
# Defining format_boolean function
format_bool() {
val="$1"
if [ "$val" != 'yes' ] && [ "$val" != 'no' ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
# Defining format_ext function # Defining format_ext function
format_ext() { format_ext() {
@ -365,6 +373,8 @@ format_validation() {
# Checking variable format # Checking variable format
case $var in case $var in
antispam) format_bool "$v" ;;
antivirus) format_bool "$v" ;;
dom_alias) format_dom "$v" ;; dom_alias) format_dom "$v" ;;
auth_pass) format_pwd "$v" ;; auth_pass) format_pwd "$v" ;;
auth_user) format_usr "$v" ;; auth_user) format_usr "$v" ;;
@ -458,15 +468,15 @@ is_package_full() {
limit=$(grep "^$1=" $V_USERS/$user/user.conf | cut -f 2 -d \' ) limit=$(grep "^$1=" $V_USERS/$user/user.conf | cut -f 2 -d \' )
# Switching on # Switching on
case "$1" in case "$1" in
WEB_DOMAINS) used=$(wc -l $V_USERS/$user/web.conf|cut -f1 -d ' ');; WEB_DOMAINS) used=$(wc -l $V_USERS/$user/web.conf|cut -f1 -d \ );;
WEB_ALIASES) used=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf |\ WEB_ALIASES) used=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf |\
awk -F "ALIAS='" '{print $2}' | cut -f 1 -d "'" |\ awk -F "ALIAS='" '{print $2}' | cut -f 1 -d \' |\
tr ',' '\n'| wc -l );; tr ',' '\n'| wc -l );;
DNS_DOMAINS) used=$(wc -l $V_USERS/$user/dns.conf|cut -f1 -d ' ');; DNS_DOMAINS) used=$(wc -l $V_USERS/$user/dns.conf|cut -f1 -d \ );;
DNS_RECORDS) used=$(wc -l $V_USERS/$user/dns/$domain|cut -f1 -d ' ');; DNS_RECORDS) used=$(wc -l $V_USERS/$user/dns/$domain|cut -f1 -d \ );;
MAIL_DOMAINS) used=$(wc -l $V_USERS/$user/mail.conf|cut -f1 -d ' ');; MAIL_DOMAINS) used=$(wc -l $V_USERS/$user/mail.conf|cut -f1 -d \ );;
DATABASES) used=$(wc -l $V_USERS/$user/db.conf|cut -f1 -d ' ');; DATABASES) used=$(wc -l $V_USERS/$user/db.conf|cut -f1 -d \ );;
CRON_JOBS) used=$(wc -l $V_USERS/$user/cron.conf|cut -f1 -d ' ');; CRON_JOBS) used=$(wc -l $V_USERS/$user/cron.conf|cut -f1 -d \ );;
esac esac
if [ "$used" -ge "$limit" ]; then if [ "$used" -ge "$limit" ]; then