github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-13 16:43:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

improving template structure

Browse source
This commit is contained in:
Serghey Rodin 2013-04-03 23:18:51 +03:00
parent fce5ddeddf
commit cd69b7bcdf
23 changed files with 135 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/v-add-web-domain-ssl
View file

@ -63,7 +63,7 @@ chmod 660 $USER_DATA/ssl/$domain.*
# Parsing domain values
get_domain_values 'web'
conf="$HOMEDIR/$user/conf/web/shttpd.conf"
tpl_file="$WEBTPL/apache_$TPL.stpl"
tpl_file="$WEBTPL/apache/$TPL.stpl"
SSL_HOME="$ssl_home"
ip=$(get_real_ip $IP)
@ -85,8 +85,8 @@ if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
fi
# Running template trigger
if [ -x $WEBTPL/apache_$template.sh ]; then
$WEBTPL/apache_$template.sh $user $domain $ip $HOMEDIR $sdocroot
if [ -x $WEBTPL/apache/$template.sh ]; then
$WEBTPL/apache/$template.sh $user $domain $ip $HOMEDIR $sdocroot
fi
# Checking main vesta httpd config
@ -100,7 +100,7 @@ fi
if [ ! -z "$NGINX" ]; then
# Adding domain to the snginx.conf
conf="$HOMEDIR/$user/conf/web/snginx.conf"
tpl_file="$WEBTPL/nginx_$NGINX.stpl"
tpl_file="$WEBTPL/nginx/$NGINX.stpl"
add_web_config
chown root:nginx $conf