From b477d8e64318c0ab987a4161b3798ee1a317e382 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 11 Aug 2011 23:23:27 +0300 Subject: [PATCH] fix: SSL key removal --- bin/v_add_web_domain | 2 +- bin/v_del_web_domain | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v_add_web_domain b/bin/v_add_web_domain index 249c48768..cd36eb252 100755 --- a/bin/v_add_web_domain +++ b/bin/v_add_web_domain @@ -183,7 +183,7 @@ v_str="$v_str TPL='$template'" v_str="$v_str ALIAS='$aliases'" v_str="$v_str $template_data" # Inserting PHP,CGI and ELOG keys v_str="$v_str STATS='' STATS_AUTH=''" -v_str="$v_str SSL='no' SSL_HOME='' SSL_CERT=''" +v_str="$v_str SSL_HOME='' SSL_CERT=''" v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'" # Registering domain diff --git a/bin/v_del_web_domain b/bin/v_del_web_domain index fcf845a42..d2c3150ce 100755 --- a/bin/v_del_web_domain +++ b/bin/v_del_web_domain @@ -101,7 +101,7 @@ rm -rf /var/log/httpd/domains/$domain.error* del_web_domain # Checking last ssl domain -ssl_dom=$(grep "SSL='yes'" $V_USERS/$user/web_domains.conf | wc -l) +ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web_domains.conf | wc -l) if [ "$ssl_dom" -eq '0' ]; then sed -i "s/ Include /#Include /" $V_HOME/$user/conf/httpd.conf fi