github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-22 14:24:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "added check for web server type in SSL config, closes #626"

Browse source 
This reverts commit d2e01fab76.
This commit is contained in:
phre4k 2016-06-27 09:37:56 +02:00
commit 3f314d19bd
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,15 +90,11 @@ if [ -x $WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$template.sh ]; then
$user $domain $ip $HOMEDIR $sdocroot $user $domain $ip $HOMEDIR $sdocroot
fi fi
# Checking web config include # Checking web config
web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf" web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
web_include=$(grep "$conf" $web_conf ) if [ -z "$(grep "$conf" $web_conf)" ]; then
if [ -z "$web_include" ] && [ "$WEB_SYSTEM" != 'nginx' ]; then
echo "Include $conf" >> $web_conf echo "Include $conf" >> $web_conf
fi fi
if [ -z "$web_include" ] && [ "$WEB_SYSTEM" = 'nginx' ]; then
echo "include $conf;" >> $web_conf
fi
# Checking proxy # Checking proxy
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then