From 6d88ca31c3fbbc5bfdc4753206a03ac3d4e6e04c Mon Sep 17 00:00:00 2001 From: dpeca Date: Sun, 5 Mar 2017 23:34:07 +0100 Subject: [PATCH] Making sure domain_idn is always set --- bin/v-add-dns-record | 2 ++ bin/v-add-mail-account-alias | 2 ++ bin/v-add-mail-account-autoreply | 2 ++ bin/v-add-mail-account-forward | 1 + bin/v-add-mail-account-fwd-only | 2 ++ bin/v-add-mail-domain | 1 + bin/v-add-mail-domain-antispam | 2 ++ bin/v-add-mail-domain-antivirus | 2 ++ bin/v-add-mail-domain-catchall | 1 + bin/v-add-mail-domain-dkim | 2 ++ bin/v-add-web-domain-alias | 2 ++ bin/v-add-web-domain-ftp | 2 ++ bin/v-add-web-domain-stats | 1 + bin/v-backup-user | 2 ++ bin/v-change-dns-domain-exp | 2 ++ bin/v-change-dns-domain-ip | 4 +++- bin/v-change-dns-domain-soa | 2 ++ bin/v-change-dns-domain-tpl | 1 + bin/v-change-dns-domain-ttl | 2 ++ bin/v-change-dns-record | 2 ++ bin/v-change-dns-record-id | 2 ++ bin/v-change-mail-account-password | 2 ++ bin/v-change-mail-account-quota | 2 ++ bin/v-change-mail-domain-catchall | 1 + bin/v-change-web-domain-backend-tpl | 1 + bin/v-change-web-domain-ftp-password | 2 ++ bin/v-change-web-domain-ftp-path | 2 ++ bin/v-change-web-domain-ip | 2 ++ bin/v-change-web-domain-name | 2 ++ bin/v-change-web-domain-proxy-tpl | 2 ++ bin/v-change-web-domain-sslcert | 2 ++ bin/v-change-web-domain-sslhome | 2 ++ bin/v-change-web-domain-stats | 1 + bin/v-change-web-domain-tpl | 2 ++ bin/v-delete-dns-on-web-alias | 2 ++ bin/v-delete-dns-record | 2 ++ bin/v-delete-mail-account | 1 + bin/v-delete-mail-account-alias | 1 + bin/v-delete-mail-account-autoreply | 2 ++ bin/v-delete-mail-account-forward | 1 + bin/v-delete-mail-account-fwd-only | 2 ++ bin/v-delete-mail-domain | 1 + bin/v-delete-mail-domain-antispam | 2 ++ bin/v-delete-mail-domain-antivirus | 2 ++ bin/v-delete-mail-domain-catchall | 1 + bin/v-delete-web-domain | 2 ++ bin/v-delete-web-domain-backend | 2 ++ bin/v-delete-web-domain-ftp | 2 ++ bin/v-delete-web-domain-proxy | 2 ++ bin/v-delete-web-domain-ssl | 2 ++ bin/v-delete-web-domain-stats | 1 + bin/v-get-dns-domain-value | 2 ++ bin/v-get-mail-account-value | 2 ++ bin/v-get-mail-domain-value | 2 ++ bin/v-suspend-dns-domain | 2 ++ bin/v-suspend-dns-record | 2 ++ bin/v-suspend-mail-account | 2 ++ bin/v-suspend-mail-accounts | 3 +++ bin/v-suspend-mail-domain | 2 ++ bin/v-suspend-web-domain | 2 ++ bin/v-unsuspend-dns-domain | 2 ++ bin/v-unsuspend-dns-record | 2 ++ bin/v-unsuspend-mail-account | 2 ++ bin/v-unsuspend-mail-accounts | 2 ++ bin/v-unsuspend-mail-domain | 2 ++ bin/v-unsuspend-web-domain | 2 ++ bin/v-update-mail-domain-disk | 2 ++ bin/v-update-web-domain-disk | 2 ++ bin/v-update-web-domain-ssl | 2 ++ bin/v-update-web-domain-stat | 1 + bin/v-update-web-domain-traff | 2 ++ func/domain.sh | 7 +++++++ func/main.sh | 3 +++ func/rebuild.sh | 3 +++ 74 files changed, 142 insertions(+), 1 deletion(-) diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index ec98fd72a..2b4c52ca4 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 record=$(idn -t --quiet -u "$3" ) record=$(echo "$record" | tr '[:upper:]' '[:lower:]') rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]') @@ -53,6 +54,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index 03ecaec96..7c28f88d6 100755 --- a/bin/v-add-mail-account-alias +++ b/bin/v-add-mail-account-alias @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 malias=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index f8c8f62b7..86c8cf110 100755 --- a/bin/v-add-mail-account-autoreply +++ b/bin/v-add-mail-account-autoreply @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 autoreply=$4 @@ -30,6 +31,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index 6be94b224..2e25d158d 100755 --- a/bin/v-add-mail-account-forward +++ b/bin/v-add-mail-account-forward @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 forward=$4 diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only index 02704cfb3..9a62805c8 100755 --- a/bin/v-add-mail-account-fwd-only +++ b/bin/v-add-mail-account-fwd-only @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -29,6 +30,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 2676e7506..10e87032b 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 antispam=${3-yes} antivirus=${4-yes} dkim=${5-yes} diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam index 4ca81f94a..eb31404fa 100755 --- a/bin/v-add-mail-domain-antispam +++ b/bin/v-add-mail-domain-antispam @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus index c0acd82d1..849107566 100755 --- a/bin/v-add-mail-domain-antivirus +++ b/bin/v-add-mail-domain-antivirus @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index f827449fb..a08976413 100755 --- a/bin/v-add-mail-domain-catchall +++ b/bin/v-add-mail-domain-catchall @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 email="$3" # Includes diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 307fe9b55..9c643b6e9 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 dkim_size=${3-1024} # Includes @@ -29,6 +30,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 932e1ffad..e5676af4e 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 aliases=$3 restart="$4" @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? format_aliases diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 1c1187060..1a722bad6 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=${1}_${3} password=$4; HIDE=4 ftp_path=$5 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats index 60caf0c16..8da1451f8 100755 --- a/bin/v-add-web-domain-stats +++ b/bin/v-add-web-domain-stats @@ -16,6 +16,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 type=$3 # Includes diff --git a/bin/v-backup-user b/bin/v-backup-user index 2cd0be551..978b4be3d 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -137,6 +137,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then mkdir -p $tmpdir/web/$domain/vesta # Get domain variables + domain_idn=$domain format_domain_idn get_domain_values 'web' @@ -286,6 +287,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log mkdir -p $tmpdir/mail/$domain/conf mkdir -p $tmpdir/mail/$domain/vesta + domain_idn=$domain format_domain_idn # Backup exim config diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index e5b0c6a95..23abb6f4d 100755 --- a/bin/v-change-dns-domain-exp +++ b/bin/v-change-dns-domain-exp @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 exp=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index fca3ecb75..69b0b0365 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -12,7 +12,8 @@ # Argument definition user=$1 domain=$2 -ip=$3 +domain_idn=$2 +p=$3 restart=$4 # Includes @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index e235a6399..8bb213708 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g') restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 63c71e417..7f4d17b1f 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -14,6 +14,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 restart=$4 diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 131b7930b..c2e29553c 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ttl=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 612ffc6ca..12f2454bd 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 dvalue=$(idn -t --quiet -u "$4" ) priority=$5 @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index 5dbcf2997..90ca28aee 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 newid=$4 restart=$5 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 0540ac7b5..28c8809b1 100755 --- a/bin/v-change-mail-account-password +++ b/bin/v-change-mail-account-password @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 password=$4; HIDE=4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index edbbababe..842169494 100755 --- a/bin/v-change-mail-account-quota +++ b/bin/v-change-mail-account-quota @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 quota=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index 022dbf1df..080e6a10c 100755 --- a/bin/v-change-mail-domain-catchall +++ b/bin/v-change-mail-domain-catchall @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 email=$3 # Includes diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl index 36a150008..4259335bc 100755 --- a/bin/v-change-web-domain-backend-tpl +++ b/bin/v-change-web-domain-backend-tpl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 restart=$4 diff --git a/bin/v-change-web-domain-ftp-password b/bin/v-change-web-domain-ftp-password index c41fdde79..6e74fd9e9 100755 --- a/bin/v-change-web-domain-ftp-password +++ b/bin/v-change-web-domain-ftp-password @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=$3 password=$4; HIDE=4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-ftp-path b/bin/v-change-web-domain-ftp-path index 8cfefadeb..61e1aa80c 100755 --- a/bin/v-change-web-domain-ftp-path +++ b/bin/v-change-web-domain-ftp-path @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=$3 ftp_path=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 05fde851a..17eb55d95 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ip=$3 restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-name b/bin/v-change-web-domain-name index 51215393a..6cbd1d999 100755 --- a/bin/v-change-web-domain-name +++ b/bin/v-change-web-domain-name @@ -12,6 +12,7 @@ # Argument defenition user=$1 domain=$2 +domain_idn=$2 new_domain=$3 restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index c2be52f11..4d022cb9d 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\ exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm" @@ -27,6 +28,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 444510c78..f60a4eb0f 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ssl_dir=$3 restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index f9768e327..06b4c563a 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -8,6 +8,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ssl_home=$3 restart=$4 @@ -19,6 +20,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats index afaa7fe78..6355e4a1b 100755 --- a/bin/v-change-web-domain-stats +++ b/bin/v-change-web-domain-stats @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 type=$3 # Includes diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index ef88e7a4c..9b9623bb1 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 restart=$4 @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias index b74fc900c..87e688493 100755 --- a/bin/v-delete-dns-on-web-alias +++ b/bin/v-delete-dns-on-web-alias @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 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:]') @@ -26,6 +27,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index 16bb2b463..4b4555dfa 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index ffc221147..f0da423cb 100755 --- a/bin/v-delete-mail-account +++ b/bin/v-delete-mail-account @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index 230d0113a..9d5f902f3 100755 --- a/bin/v-delete-mail-account-alias +++ b/bin/v-delete-mail-account-alias @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 malias=$4 diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply index 2169190af..d4cb02133 100755 --- a/bin/v-delete-mail-account-autoreply +++ b/bin/v-delete-mail-account-autoreply @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 malias=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index c690e9a46..bb2096514 100755 --- a/bin/v-delete-mail-account-forward +++ b/bin/v-delete-mail-account-forward @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 forward=$4 diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only index f5147f9b9..820164ed8 100755 --- a/bin/v-delete-mail-account-fwd-only +++ b/bin/v-delete-mail-account-fwd-only @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index f128d752a..f3541edbe 100755 --- a/bin/v-delete-mail-domain +++ b/bin/v-delete-mail-domain @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam index 355684344..455ed9caa 100755 --- a/bin/v-delete-mail-domain-antispam +++ b/bin/v-delete-mail-domain-antispam @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus index e176a7555..312120f77 100755 --- a/bin/v-delete-mail-domain-antivirus +++ b/bin/v-delete-mail-domain-antivirus @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index f5a7ddf8b..7a30175d0 100755 --- a/bin/v-delete-mail-domain-catchall +++ b/bin/v-delete-mail-domain-catchall @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index 6ef7280be..529f5d09e 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -26,6 +27,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend index 5b5480961..47c004443 100755 --- a/bin/v-delete-web-domain-backend +++ b/bin/v-delete-web-domain-backend @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index 081305847..218f4d55f 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index 215506cb4..73eeabb73 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 131feb239..05e8c9403 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats index 005669997..33a22dca6 100755 --- a/bin/v-delete-web-domain-stats +++ b/bin/v-delete-web-domain-stats @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-get-dns-domain-value b/bin/v-get-dns-domain-value index ec77df2f0..b530588a1 100755 --- a/bin/v-get-dns-domain-value +++ b/bin/v-get-dns-domain-value @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") # Includes @@ -20,6 +21,7 @@ source $VESTA/func/main.sh # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-get-mail-account-value b/bin/v-get-mail-account-value index f011875c6..abff06a53 100755 --- a/bin/v-get-mail-account-value +++ b/bin/v-get-mail-account-value @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 key=$(echo "$4"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") @@ -21,6 +22,7 @@ source $VESTA/func/main.sh # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-get-mail-domain-value b/bin/v-get-mail-domain-value index e7ad584a5..97a1a3e46 100755 --- a/bin/v-get-mail-domain-value +++ b/bin/v-get-mail-domain-value @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") # Includes @@ -20,6 +21,7 @@ source $VESTA/func/main.sh # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index d016b786f..b42e2e99d 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart="$3" # Includes @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 4de9ae408..003f8d757 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account index 803594eb1..06d98a66d 100755 --- a/bin/v-suspend-mail-account +++ b/bin/v-suspend-mail-account @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts index bd282ca63..ab8c440fa 100755 --- a/bin/v-suspend-mail-accounts +++ b/bin/v-suspend-mail-accounts @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -19,6 +20,8 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain +format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain index 66fe81522..201dc7f3d 100755 --- a/bin/v-suspend-mail-domain +++ b/bin/v-suspend-mail-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 15dbe9c47..7bd658ceb 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -14,6 +14,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index e845b6a83..bc8de6eec 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -20,6 +21,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index c84e7744c..f1bc163f4 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index 2e9a887fc..314c13bc0 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-mail-account @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts index 2c651b2cd..420bcf050 100755 --- a/bin/v-unsuspend-mail-accounts +++ b/bin/v-unsuspend-mail-accounts @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -20,6 +21,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain index 9c688d6f3..935865d70 100755 --- a/bin/v-unsuspend-mail-domain +++ b/bin/v-unsuspend-mail-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index b47b67f4a..91bc1e16b 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index a1b6b3f4c..451dbd37d 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -20,6 +21,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index 252fac3c2..ac851b922 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-ssl b/bin/v-update-web-domain-ssl index 8a3381a99..877005c40 100755 --- a/bin/v-update-web-domain-ssl +++ b/bin/v-update-web-domain-ssl @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ssl_dir=$3 restart=$4 @@ -27,6 +28,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index 24eba8cf7..c77b750be 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff index 299bafd23..ce18707d7 100755 --- a/bin/v-update-web-domain-traff +++ b/bin/v-update-web-domain-traff @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/func/domain.sh b/func/domain.sh index 3ee84c8ce..fd205a2bc 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -172,6 +172,10 @@ add_web_config() { conf="$HOMEDIR/$user/conf/web/s$1.conf" fi + if [ -z "$domain_idn" ]; then + format_domain_idn + fi + cat $WEBTPL/$1/$WEB_BACKEND/$2 | \ sed -e "s|%ip%|$local_ip|g" \ -e "s|%domain%|$domain|g" \ @@ -228,6 +232,9 @@ get_web_config_lines() { check_result $E_PARSING "can't parse template $1" fi + if [ -z "$domain_idn" ]; then + format_domain_idn + fi vhost_lines=$(grep -niF "name $domain_idn" $2) vhost_lines=$(echo "$vhost_lines" |egrep "$domain_idn($| |;)") #" vhost_lines=$(echo "$vhost_lines" |cut -f 1 -d :) diff --git a/func/main.sh b/func/main.sh index b1761fd88..b9dc14c8e 100644 --- a/func/main.sh +++ b/func/main.sh @@ -864,6 +864,9 @@ format_domain() { } format_domain_idn() { + if [ -z "$domain_idn" ]; then + domain_idn=$domain + fi if [[ "$domain_idn" = *[![:ascii:]]* ]]; then domain_idn=$(idn -t --quiet -a $domain_idn) fi diff --git a/func/rebuild.sh b/func/rebuild.sh index 69331cce4..63143472f 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -227,6 +227,9 @@ rebuild_web_domain_conf() { # Adding web stats parser if [ ! -z "$STATS" ]; then + if [ -z "$domain_idn" ]; then + format_domain_idn + fi cat $WEBTPL/$STATS/$STATS.tpl |\ sed -e "s|%ip%|$local_ip|g" \ -e "s|%web_system%|$WEB_SYSTEM|g" \