Skip to content

Commit c819cda

Browse files
serghey-rodinserghey-rodin
committed
replaced SSL key w/ SSL_CERT
1 parent 9f1d16d commit c819cda

17 files changed

+33
-35
lines changed

‎bin/v_add_web_domain_alias‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ str_repl=" ServerAlias ${new_alias_idn//,/ }"
8989
httpd_change_config
9090

9191
# Checking ssl domain
92-
ssl=$(get_web_domain_value '$SSL')
93-
if [ "$ssl" = 'yes' ]; then
92+
cert=$(get_web_domain_value '$SSL_CERT')
93+
if [ ! -z "$cert" ]; then
9494

9595
# Defining ssl template
9696
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"

‎bin/v_add_web_domain_cgi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ str_repl=' Options +Includes -Indexes +ExecCGI'
7575
httpd_change_config
7676

7777
# Checking ssl
78-
ssl=$(get_web_domain_value '$SSL')
79-
if [ "$ssl" = 'yes' ]; then
78+
cert=$(get_web_domain_value '$SSL_CERT')
79+
if [ ! -z "$cert" ]; then
8080

8181
# Get ssl template name
8282
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"

‎bin/v_add_web_domain_elog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ str_repl=" ErrorLog /var/log/httpd/domains/$domain.error.log"
6666
httpd_change_config
6767

6868
# Checking ssl
69-
ssl=$(get_web_domain_value '$SSL')
70-
if [ "$ssl" = 'yes' ]; then
69+
cert=$(get_web_domain_value '$SSL_CERT')
70+
if [ ! -z "$cert" ]; then
7171

7272
# Get ssl template name
7373
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"

‎bin/v_add_web_domain_ssl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ip=$(get_web_domain_value '$IP')
5252
is_sys_ip_owner
5353

5454
# Check ssl is not added
55-
is_web_domain_key_empty '$SSL'
55+
is_web_domain_key_empty '$SSL_CERT'
5656

5757
# Checking ssl certificate
5858
is_web_domain_cert_valid
@@ -121,7 +121,6 @@ fi
121121
increase_user_value "$user" '$U_WEB_SSL'
122122

123123
# Adding ssl values
124-
update_web_domain_value '$SSL' 'yes'
125124
update_web_domain_value '$SSL_HOME' "$tpl_option"
126125
update_web_domain_value '$SSL_CERT' "$cert"
127126

‎bin/v_change_web_domain_ip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ old_ip=$(get_web_domain_value '$IP')
6161
change_domain_ip "$conf" "$domain" "$ip" "$old_ip" "$tpl_file"
6262

6363
# Checking ssl
64-
ssl=$(get_web_domain_value '$SSL')
65-
if [ "$ssl" = 'yes' ]; then
64+
cert=$(get_web_domain_value '$SSL_CERT')
65+
if [ ! -z "$cert" ]; then
6666

6767
# Get tpl
6868
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"

‎bin/v_change_web_domain_sslcert‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
# Argument defenition
99
user="$1"
10-
domain="$2"
10+
domain=$(idn -t --quiet -u "$2" )
11+
domain_idn=$(idn -t --quiet -a "$domain")
1112
certificate="$3"
1213

1314
# Importing variables
@@ -42,7 +43,7 @@ is_web_domain_valid
4243
is_domain_suspended 'web_domains'
4344

4445
# Check SSL is added
45-
is_web_domain_value_exist '$SSL'
46+
is_web_domain_value_exist '$SSL_CERT'
4647

4748
# Checking ssl certificate
4849
is_web_domain_cert_valid

‎bin/v_change_web_domain_sslhome‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ is_web_domain_valid
4242
is_domain_suspended 'web_domains'
4343

4444
# Check SSL is added
45-
is_web_domain_value_exist '$SSL'
45+
is_web_domain_value_exist '$SSL_CERT'
4646

4747

4848
#----------------------------------------------------------#

‎bin/v_change_web_domain_tpl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ conf="$V_HOME/$user/conf/httpd.conf"
6060
httpd_del_config
6161

6262
# Checking ssl
63-
ssl=$(get_web_domain_value '$SSL')
64-
if [ "$ssl" = 'yes' ]; then
63+
cert=$(get_web_domain_value '$SSL_CERT')
64+
if [ ! -z "$cert" ]; then
6565

6666
# Get tpl
6767
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"
@@ -104,11 +104,10 @@ if [ -x $V_WEBTPL/apache_$template.sh ]; then
104104
fi
105105

106106
# Checking ssl
107-
if [ "$ssl" = 'yes' ]; then
107+
if [ ! -z "$cert" = 'yes' ]; then
108108
# Defining variables for ssl template replace
109109
web_ssl_port=$(get_config_value '$WEB_SSL_PORT')
110110
tpl_option=$(get_web_domain_value '$SSL_HOME')
111-
cert=$(get_web_domain_value '$SSL_CERT')
112111
ssl_cert="$V_HOME/$user/conf/$cert.crt"
113112
ssl_key="$V_HOME/$user/conf/$cert.key"
114113
case $tpl_option in

‎bin/v_del_web_domain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ conf="$V_HOME/$user/conf/httpd.conf"
5757
httpd_del_config
5858

5959
# Checking ssl
60-
ssl=$(get_web_domain_value '$SSL')
61-
if [ "$ssl" = 'yes' ]; then
60+
cert=$(get_web_domain_value '$SSL_CERT')
61+
if [ ! -z "$cert" ]; then
6262

6363
# Get tpl
6464
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"

‎bin/v_del_web_domain_alias‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ str_repl=" ServerAlias ${new_alias_idn//,/ }"
8686
httpd_change_config
8787

8888
# Checking ssl domain
89-
ssl=$(get_web_domain_value '$SSL')
90-
if [ "$ssl" = 'yes' ]; then
89+
cert=$(get_web_domain_value '$SSL_CERT')
90+
if [ ! -z "$cert" ]; then
9191

9292
# Defining ssl template
9393
tpl_file="$V_WEBTPL/apache_$tpl_name.stpl"

0 commit comments

Comments
 (0)