github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 18:49:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed web_domains.conf to web.conf

Browse source
This commit is contained in:
Serghey Rodin 2011-08-14 14:53:55 +03:00
commit d708923022
22 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
func/cert_func.sh
View file

@ -65,7 +65,7 @@ is_cert_valid() {
is_cert_used() {
# Parsing config
check_cert=$(grep "SSL_CERT='$cert'" $V_USERS/$user/web_domains.conf)
check_cert=$(grep "SSL_CERT='$cert'" $V_USERS/$user/web.conf)
# Checking result
if [ ! -z "$check_cert" ]; then

16
func/domain_func.sh
View file

@ -63,10 +63,10 @@ is_dns_domain_free() {
is_web_domain_free() {
search_dom=${1-$domain}
# Parsing domain values
check_domain=$(grep -F "IN='$search_dom'" $V_USERS/$user/web_domains.conf)
check_domain=$(grep -F "IN='$search_dom'" $V_USERS/$user/web.conf)
# Parsing alias values
check_alias=$(grep -F 'ALIAS=' $V_USERS/$user/web_domains.conf | \
check_alias=$(grep -F 'ALIAS=' $V_USERS/$user/web.conf | \
awk -F "ALIAS=" '{print $2}' | \
cut -f 2 -d \' | \
sed -e "s/,/\n/g" | \
@ -94,7 +94,7 @@ is_dns_domain_valid() {
is_web_domain_valid() {
# Parsing domain values
check_domain=$(grep -F "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf)
check_domain=$(grep -F "DOMAIN='$domain'" $V_USERS/$user/web.conf)
# Checking result
if [ -z "$check_domain" ]; then
@ -288,7 +288,7 @@ get_web_domain_value() {
key="$1"
# Parsing domains
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf )
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
# Parsing key=value
for keys in $string; do
@ -325,7 +325,7 @@ update_web_domain_value() {
value="$2"
# Defining conf
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Parsing conf
domain_str=$(grep -n "DOMAIN='$domain'" $conf)
@ -386,7 +386,7 @@ is_web_domain_key_empty() {
key="$1"
# Parsing domains
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf )
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
# Parsing key=value
for keys in $string; do
@ -419,7 +419,7 @@ is_web_domain_value_exist() {
key="$1"
# Parsing domains
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf )
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
# Parsing key=value
for keys in $string; do
@ -483,7 +483,7 @@ del_dns_domain() {
}
del_web_domain() {
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Parsing domains
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )

2
func/ip_func.sh
View file

@ -188,7 +188,7 @@ decrease_ip_value() {
new_web=$((current_web - 1))
# -1 user
check_ip=$(grep $sip $V_USERS/$user/web_domains.conf |wc -l)
check_ip=$(grep $sip $V_USERS/$user/web.conf |wc -l)
if [ "$check_ip" -lt 2 ]; then
new_usr=$(echo "$current_usr" |\
sed -e "s/,/\n/g"|\

12
func/shared_func.sh
View file

@ -440,7 +440,7 @@ is_package_full() {
web_domain() {
# Checking zero domains
domain_number=$(wc -l $V_USERS/$user/web_domains.conf|cut -f 1 -d ' ')
domain_number=$(wc -l $V_USERS/$user/web.conf|cut -f 1 -d ' ')
# Comparing current val with conf
val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' )
@ -453,7 +453,7 @@ is_package_full() {
web_alias() {
# Parsing aliases
alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf|\
alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf|\
awk -F "ALIAS=" '{print $2}' | cut -f 2 -d \' |\
sed -e "s/,/\n/g" | wc -l )
@ -476,7 +476,7 @@ is_package_full() {
fi
# Checking domains
domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web_domains.conf | wc -l)
domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)
# Comparing current val with conf
if [ "$domain_nmb" -ge "$val" ]; then
echo "Error: Upgrade package"
@ -1198,9 +1198,9 @@ get_usr_disk() {
size=$((size + dir_usage))
# Checking web
if [ -f "$V_USERS/$user/web_domains.conf" ]; then
if [ -f "$V_USERS/$user/web.conf" ]; then
# Using tricky way to parse configs
disk_usage=$(grep 'U_DISK=' $V_USERS/$user/web_domains.conf |\
disk_usage=$(grep 'U_DISK=' $V_USERS/$user/web.conf |\
awk -F "U_DISK='" '{print $2}'|cut -f 1 -d "'")
for disk in $disk_usage; do
size=$((size + disk))
@ -1232,7 +1232,7 @@ get_usr_disk() {
get_usr_traff() {
size='0'
conf='web_domains.conf'
conf='web.conf'
# Checking web
if [ -f "$V_USERS/$user/$conf" ]; then