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

Fix domain rebuild for new conf style

Browse source
This commit is contained in:
Serghey Rodin 2017-12-27 19:08:28 +02:00
commit 5a42216130
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
bin/v-rebuild-web-domains
View file

@ -36,15 +36,29 @@ is_object_unsuspended 'user' 'USER' "$user"
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Deleting old configs # Deleting old web configs
sed -i "/.*\/$user\//d" /etc/$WEB_SYSTEM/conf.d/vesta.conf sed -i "/.*\/$user\//d" /etc/$WEB_SYSTEM/conf.d/vesta.conf
rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf if [ -e "$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf" ]; then
rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf rm $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
fi
if [ -e "$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" ]; then
rm $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
fi
# Deleting old proxy configs
if [ ! -z "$PROXY_SYSTEM" ]; then if [ ! -z "$PROXY_SYSTEM" ]; then
sed -i "/.*\/$user\//d" /etc/$PROXY_SYSTEM/conf.d/vesta.conf sed -i "/.*\/$user\//d" /etc/$PROXY_SYSTEM/conf.d/vesta.conf
rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf if [ -e "$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" ]; then
rm $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
fi
if [ -e "$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" ]; then
rm $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
fi
fi fi
# Deleting backend configs
if [ ! -z "$WEB_BACKEND" ]; then if [ ! -z "$WEB_BACKEND" ]; then
if [ "$WEB_BACKEND_POOL" = 'user' ]; then if [ "$WEB_BACKEND_POOL" = 'user' ]; then
prepare_web_backend prepare_web_backend

2
func/domain.sh
View file

@ -202,7 +202,7 @@ add_web_config() {
-e "s|%ssl_pem%|$ssl_pem|g" \ -e "s|%ssl_pem%|$ssl_pem|g" \
-e "s|%ssl_ca_str%|$ssl_ca_str|g" \ -e "s|%ssl_ca_str%|$ssl_ca_str|g" \
-e "s|%ssl_ca%|$ssl_ca|g" \ -e "s|%ssl_ca%|$ssl_ca|g" \
>> $conf > $conf
chown root:$user $conf chown root:$user $conf
chmod 640 $conf chmod 640 $conf