Skip to content

Commit 3fa2133

Browse files
committed
Added additional domain parameter formatting when adding SSL for domain
1 parent fea7e84 commit 3fa2133

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

bin/v-add-web-domain-ssl

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,25 @@
1616

1717
# Argument definition
1818
user=$1
19-
domain=$(idn -t --quiet -u "$2" )
20-
domain_idn=$(idn -t --quiet -a "$domain")
19+
domain=$2
2120
ssl_dir=$3
2221
ssl_home=${4-same}
2322
restart="$5"
2423

24+
# Additional argument formatting
25+
if [[ "$domain" =~ [[:upper:]] ]]; then
26+
domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
27+
fi
28+
if [[ "$domain" =~ ^www\..* ]]; then
29+
domain=$(echo "$domain" |sed -e "s/^www.//")
30+
fi
31+
if [[ "$domain" =~ .*\.$ ]]; then
32+
domain=$(echo "$domain" |sed -e "s/\.$//")
33+
fi
34+
35+
domain=$(idn -t --quiet -u "$domain" )
36+
domain_idn=$(idn -t --quiet -a "$domain")
37+
2538
# Includes
2639
source $VESTA/func/main.sh
2740
source $VESTA/func/domain.sh

0 commit comments

Comments
 (0)