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

Merge changes from upstream

Browse source
This commit is contained in:
ZonD Eighty 2013-01-16 14:12:53 +04:00
commit c094d8582d
54 changed files with 4981 additions and 5671 deletions
Download patch file Download diff file Expand all files Collapse all files

14
func/domain.sh
View file

@ -49,9 +49,9 @@ is_domain_new() {
type="$1"
dom=${2-$domain}
web=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
dns=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
mail=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
web=$(grep -H "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
dns=$(grep -H "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
mail=$(grep -H "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
# Check web domain
if [ ! -z "$web" ] && [ "$type" == 'web' ]; then
@ -101,10 +101,10 @@ is_domain_new() {
# Check web aliases
web_alias=$(grep -w $dom $VESTA/data/users/*/web.conf)
if [ ! -z "$web_alias" ]; then
c1=$(grep "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c2=$(grep "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c3=$(grep ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c4=$(grep ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c1=$(grep -H "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c2=$(grep -H "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c3=$(grep -H ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c4=$(grep -H ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
if [ ! -z "$c1" ] && [ "$type" == "web" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"

2
func/main.sh
View file

@ -64,7 +64,7 @@ log_history() {
touch $log
if [ '99' -lt "$(wc -l $log |cut -f 1 -d ' ')" ]; then
tail -n 99 $log > $log.moved
tail -n 49 $log > $log.moved
mv -f $log.moved $log
chmod 660 $log
fi