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

added https support

Browse source
This commit is contained in:
Serghey Rodin 2011-06-22 00:43:30 +03:00
commit 9b5caa198c
1 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
bin/v_rebuild_web_domains
View file

@ -67,22 +67,43 @@ for domain in $domains; do
aliases=$(get_web_domain_value '$ALIAS') aliases=$(get_web_domain_value '$ALIAS')
aliases_idn=$(idn -t --quiet -a "$aliases") aliases_idn=$(idn -t --quiet -a "$aliases")
#ssl_cert=$()
#ssl_key=$()
# Adding domain to the tmp_httpd.conf # Adding domain to the tmp_httpd.conf
conf="$V_HOME/$user/conf/tmp_httpd.conf" conf="$V_HOME/$user/conf/tmp_httpd.conf"
httpd_add_config httpd_add_config
# Running template trigger # Running template trigger
if [ -e $V_WEBTPL/apache_$template.sh ]; then if [ -x $V_WEBTPL/apache_$template.sh ]; then
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot $port $V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME $docroot $port
fi fi
# Checking ssl
ssl=$(get_web_domain_value '$SSL')
if [ "$ssl" = 'yes' ]; then
# Parsing certificate params
cert=$(get_web_domain_value '$SSL_CERT')
ssl_cert="$V_HOME/$user/conf/$cert.crt"
ssl_key="$V_HOME/$user/conf/$cert.key"
tpl_option=$(get_web_domain_value '$SSL_HOME')
case $tpl_option in
single) docroot="$V_HOME/$user/domains/$domain/public_shtml" ;;
same) docroot="$V_HOME/$user/domains/$domain/public_html" ;;
*) check_args '3' "$#" 'user domain certificate [sslhome]'
esac
# Adding domain to the httpd.conf
conf="$V_HOME/$user/conf/tmp_shttpd.conf"
tpl_file="$V_WEBTPL/apache_$template.stpl"
httpd_add_config
if [ -x $V_WEBTPL/apache_$template.sh ]; then
$V_WEBTPL/apache_$template.sh $user $domain $ip $V_HOME \
$docroot $port
fi
fi
done done
# Renaming tmp config # Renaming tmp config
tmp_conf="$conf" tmp_conf="$V_HOME/$user/conf/tmp_httpd.conf"
conf="$V_HOME/$user/conf/httpd.conf" conf="$V_HOME/$user/conf/httpd.conf"
mv $tmp_conf $conf mv $tmp_conf $conf
@ -93,7 +114,18 @@ if [ -z "$main_conf_check" ]; then
echo "Include $conf" >>$main_conf echo "Include $conf" >>$main_conf
fi fi
exit # Checking ssl
if [ ! -z "$ssl_cert" ]; then
tmp_conf="$V_HOME/$user/conf/tmp_shttpd.conf"
conf="$V_HOME/$user/conf/shttpd.conf"
mv $tmp_conf $conf
# Checking include in main httpd.conf
main_conf_check=$(grep "$conf" $main_conf )
if [ -z "$main_conf_check" ]; then
echo "Include $conf" >>$main_conf
fi
fi
#----------------------------------------------------------# #----------------------------------------------------------#