github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 13:54:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed ssl functions

Browse source
This commit is contained in:
Serghey Rodin 2012-06-22 10:39:09 +03:00
commit d218e55de5
33 changed files with 11 additions and 1044 deletions
Download patch file Download diff file Expand all files Collapse all files

10
func/domain.sh
View file

@ -160,6 +160,7 @@ add_web_config() {
-e "s/%ssl_key%/${ssl_key////\/}/g" \
-e "s/%ssl_pem%/${ssl_pem////\/}/g" \
-e "s/%ssl_ca_str%/${ssl_ca_str////\/}/g" \
-e "s/%ssl_ca%/${ssl_ca////\/}/g" \
-e "s/%nginx_extentions%/${NGINX_EXT//,/|}/g" \
-e "s/%elog%/$elog/g" \
-e "s/%cgi%/$cgi/g" \
@ -238,7 +239,12 @@ is_web_domain_cert_valid() {
exit $E_NOTEXIST
fi
crt=$(openssl verify $ssl_dir/$domain.crt 2>/dev/null |grep '/C=')
if [ ! -e "$ssl_dir/$domain.ca" ]; then
crt=$(openssl verify $ssl_dir/$domain.crt 2>/dev/null |grep 'OK')
else
crt=$(openssl verify -untrusted $ssl_dir/$domain.ca \
$ssl_dir/$domain.crt 2>/dev/null |grep 'OK')
fi
if [ -z "$crt" ]; then
echo "Error: certificate is not valid"
log_event "$E_INVALID" "$EVENT"
@ -253,7 +259,7 @@ is_web_domain_cert_valid() {
fi
if [ -e "$ssl_dir/$domain.ca" ]; then
ca=$(openssl verify $ssl_dir/$domain.ca 2>/dev/null |grep '/C=')
ca=$(openssl verify $ssl_dir/$domain.ca 2>/dev/null |grep 'OK')
if [ -z "$ca" ]; then
echo "Error: ssl certificate authority is not valid"
log_event "$E_INVALID" "$EVENT"