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

renamed SSL_CERT to SSL

Browse source
This commit is contained in:
Serghey Rodin 2011-11-22 13:17:36 +02:00
commit 30d1240682
24 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
func/cert.func
View file

@ -65,7 +65,7 @@ is_cert_valid() {
is_cert_used() {
# Parsing config
check_cert=$(grep "SSL_CERT='$ssl'" $V_USERS/$user/web.conf)
check_cert=$(grep "SSL='$ssl'" $V_USERS/$user/*.conf)
# Checking result
if [ ! -z "$check_cert" ]; then

10
func/domain.func
View file

@ -688,7 +688,7 @@ upd_web_domain_values() {
else
alias_string="$alias_string\n ServerAlias $server_alias"
fi
(( ++j))
j=2
server_alias=''
fi
if [ "$i" -eq 1 ]; then
@ -699,10 +699,10 @@ upd_web_domain_values() {
aliases_idn="$aliases_idn,$dalias"
server_alias="$server_alias $dalias"
fi
(( ++i))
i=2
done
if [ "$j" -gt 1 ]; then
if [ $j -gt 1 ]; then
alias_string="$alias_string\n ServerAlias $server_alias"
else
alias_string="ServerAlias $server_alias"
@ -733,8 +733,8 @@ upd_web_domain_values() {
fi
# Defining SSL vars
ssl_cert="$V_HOME/$user/conf/$SSL_CERT.crt"
ssl_key="$V_HOME/$user/conf/$SSL_CERT.key"
ssl_cert="$V_HOME/$user/conf/$SSL.crt"
ssl_key="$V_HOME/$user/conf/$SSL.key"
case $SSL_HOME in
single) docroot="$V_HOME/$user/web/$domain/public_shtml" ;;
same) docroot="$V_HOME/$user/web/$domain/public_html" ;;