mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-21 05:44:07 -07:00
trum() dots
This commit is contained in:
parent
d69ed099f2
commit
805bc37cd7
7 changed files with 14 additions and 4 deletions
|
@ -16,6 +16,7 @@
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
user=$1
|
user=$1
|
||||||
domain=$(idn -t --quiet -u "$2" )
|
domain=$(idn -t --quiet -u "$2" )
|
||||||
|
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
||||||
domain_idn=$(idn -t --quiet -a "$domain")
|
domain_idn=$(idn -t --quiet -a "$domain")
|
||||||
ip=$3
|
ip=$3
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
user=$1
|
user=$1
|
||||||
domain=$(idn -t --quiet -u "$2" )
|
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
domain_idn=$(idn -t --quiet -a "$domain")
|
domain_idn=$(idn -t --quiet -a "$domain")
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
user=$1
|
user=$1
|
||||||
domain=$(idn -t --quiet -u "$2" )
|
domain=$(idn -t --quiet -u "$2" )
|
||||||
|
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
||||||
domain_idn=$(idn -t --quiet -a "$domain")
|
domain_idn=$(idn -t --quiet -a "$domain")
|
||||||
antispam=${3-yes}
|
antispam=${3-yes}
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
user=$1
|
user=$1
|
||||||
domain=$(idn -t --quiet -u "$2" )
|
domain=$(idn -t --quiet -u "$2" )
|
||||||
|
domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
||||||
domain_idn=$(idn -t --quiet -a "$domain")
|
domain_idn=$(idn -t --quiet -a "$domain")
|
||||||
ip=$3
|
ip=$3
|
||||||
|
|
|
@ -16,6 +16,7 @@ domain=$(idn -t --quiet -u "$2" )
|
||||||
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
||||||
domain_idn=$(idn -t --quiet -a "$domain")
|
domain_idn=$(idn -t --quiet -a "$domain")
|
||||||
dom_alias=$(idn -t --quiet -u "$3" )
|
dom_alias=$(idn -t --quiet -u "$3" )
|
||||||
|
dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
|
dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
|
||||||
dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
|
dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
|
||||||
restart="$4"
|
restart="$4"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
user=$1
|
user=$1
|
||||||
domain=$(idn -t --quiet -u "$2" )
|
domain=$(idn -t --quiet -u "$2" )
|
||||||
domain_idn=$(idn -t --quiet -a "$domain")
|
domain_idn=$(idn -t --quiet -a "$domain")
|
||||||
soa=$3
|
soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
source $VESTA/conf/vesta.conf
|
source $VESTA/conf/vesta.conf
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
# Argument defenition
|
# Argument defenition
|
||||||
user=$1
|
user=$1
|
||||||
ns1=$2
|
ns1=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
ns2=$3
|
ns2=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
ns3=$4
|
ns3=$4
|
||||||
ns4=$5
|
ns4=$5
|
||||||
ns5=$6
|
ns5=$6
|
||||||
|
@ -35,21 +35,27 @@ check_args '3' "$#" 'user ns1 ns2 [ns3] [ns4] [ns5] [ns6] [ns7] [ns8]'
|
||||||
# Checking argument format
|
# Checking argument format
|
||||||
validate_format 'user' 'ns1' 'ns2'
|
validate_format 'user' 'ns1' 'ns2'
|
||||||
if [ ! -z "$ns3" ]; then
|
if [ ! -z "$ns3" ]; then
|
||||||
|
ns3=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
validate_format 'ns3'
|
validate_format 'ns3'
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$ns4" ]; then
|
if [ ! -z "$ns4" ]; then
|
||||||
|
ns4=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
validate_format 'ns4'
|
validate_format 'ns4'
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$ns5" ]; then
|
if [ ! -z "$ns5" ]; then
|
||||||
|
ns5=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
validate_format 'ns5'
|
validate_format 'ns5'
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$ns6" ]; then
|
if [ ! -z "$ns6" ]; then
|
||||||
|
ns6=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
validate_format 'ns6'
|
validate_format 'ns6'
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$ns7" ]; then
|
if [ ! -z "$ns7" ]; then
|
||||||
|
ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
validate_format 'ns7'
|
validate_format 'ns7'
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$ns8" ]; then
|
if [ ! -z "$ns8" ]; then
|
||||||
|
ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g')
|
||||||
validate_format 'ns8'
|
validate_format 'ns8'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue