0ct0pu5/webinoly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update process

Browse source 
Update process to correctly upgrade server version.
This commit is contained in:
Cristhian Martínez Ochoa 2019-08-20 19:34:19 -06:00
parent 0f57b418a0
commit 31828d4d48
3 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/update
View file

@ -64,6 +64,39 @@ onetwo_to_onethree() {
}
onethree_to_onefour() {
sudo rm /opt/webinoly/templates/nginx/conf.d/blockips.conf
if [[ $(conf_read nginx) == "true" ]]; then
sudo mkdir -p /etc/nginx/apps.d
sudo cp /etc/nginx/common/acl.conf /opt/webinoly/templates/source/acl.conf.old
grep "^allow [^127.0.0.1]" /opt/webinoly/templates/source/acl.conf.old > /etc/nginx/apps.d/whitelist-acl.conf
[[ ! -s /etc/nginx/apps.d/whitelist-acl.conf ]] && sudo rm /etc/nginx/apps.d/whitelist-acl.conf
for site in "/etc/nginx/sites-available"/*
do
domi=$(echo $site | cut -f 5 -d "/")
if [[ $domi != "html" && $domi != $(conf_read tools-port) ]]; then
if [[ $(is_proxy $domi) == "true" ]]; then
pat="\t}"
elif [[ $(is_wp $domi) == "true" || $(is_php $domi) == "true" ]]; then
pat="index"
else
pat="\tlocation \/ { try"
fi
sudo sed -i "/$pat/a \ # WebinolyCustomEnd" /etc/nginx/sites-available/$domi
sudo sed -i "/$pat/a \ # WebinolyCustom" /etc/nginx/sites-available/$domi
sudo sed -i "/$pat/a \ " /etc/nginx/sites-available/$domi
if [[ $(is_wp $domi) == "true" ]]; then
[[ $(conf_read wp-admin-auth) == "purged" ]] && sudo httpauth $domi -wp-admin=off
[[ $(conf_read yoast-sitemap) != "purged" ]] && sudo site $domi -yoast-sitemap=on
fi
fi
done
fi
}
# Version numbers without point
[[ ${oldver//.} -lt 11 ]] && onezero_to_oneone > /dev/null 2>&1 &
wait $!
@ -71,6 +104,8 @@ wait $!
wait $!
[[ ${oldver//.} -lt 13 ]] && onetwo_to_onethree > /dev/null 2>&1 &
wait $!
[[ ${oldver//.} -lt 14 ]] && onethree_to_onefour > /dev/null 2>&1 &
wait $!
sudo webinoly -server-reset

2
plugins/site
View file

@ -221,7 +221,7 @@ elif [[ -n $wp && -n $domain ]]; then
if [[ -z $subfolder ]]; then
createsite
sudo sed -i '/locations.conf/i \ include common/wpcommon.conf;' /etc/nginx/sites-available/$domain
[[ $(conf_read wp-admin-auth) == "purged" ]] && sudo httpauth -wp-admin=off -site=$domain > /dev/null 2>&1
[[ $(conf_read wp-admin-auth) == "purged" ]] && sudo httpauth $domain -wp-admin=off > /dev/null 2>&1
[[ $(conf_read yoast-sitemap) != "purged" ]] && sudo site $domain -yoast-sitemap=on > /dev/null 2>&1
else
if [[ -a /etc/nginx/sites-available/$domain && -n $subfolder && $type == [123] && -d /var/www/$domain/htdocs$subfolder ]]; then

2
plugins/webinoly
View file

@ -36,10 +36,12 @@ elif [[ -n $server_reset ]]; then
# Regenerate NGINX conf files
if [[ $(conf_read nginx-optim) == "true" && $server_reset =~ ^(nginx|all)$ ]]; then
sudo cp -p /etc/nginx/conf.d/blockips.conf /tmp/webinoly_blockips_backup
sudo rm -rf /etc/nginx/common
sudo rm -rf /etc/nginx/conf.d/*
linux_purge
nginx_optim
sudo mv /tmp/webinoly_blockips_backup /etc/nginx/conf.d/blockips.conf
echo "${gre}Nginx settings has been updated successfully!${end}"
nginx_not="true" # Nginx-Reload not-needed.
elif [[ $(conf_read nginx-optim) != "true" && $server_reset == "nginx" ]]; then