tools-port improved
- default value is now assigned during creation site, not in initial installation. - webinoly -tools-port command now works even if nginx is not installed.
This commit is contained in:
parent
1e955d322b
commit
64b5c64021
|
@ -298,6 +298,7 @@ php_optim() {
|
||||||
|
|
||||||
nginx_tool_site() {
|
nginx_tool_site() {
|
||||||
# Port 22222 tools site
|
# Port 22222 tools site
|
||||||
|
[[ -z $(conf_read tools-port) ]] && tools_port 22222
|
||||||
sudo site $(conf_read tools-port) -php
|
sudo site $(conf_read tools-port) -php
|
||||||
sudo cp /opt/webinoly/templates/nginx/22222 /etc/nginx/sites-available/$(conf_read tools-port)
|
sudo cp /opt/webinoly/templates/nginx/22222 /etc/nginx/sites-available/$(conf_read tools-port)
|
||||||
sudo sed -i "s/22222/$(conf_read tools-port)/g" /etc/nginx/sites-available/$(conf_read tools-port)
|
sudo sed -i "s/22222/$(conf_read tools-port)/g" /etc/nginx/sites-available/$(conf_read tools-port)
|
||||||
|
@ -306,13 +307,9 @@ nginx_tool_site() {
|
||||||
|
|
||||||
|
|
||||||
nginx_tool() {
|
nginx_tool() {
|
||||||
if [[ $(conf_read php) == "true" ]]; then
|
[[ $(conf_read php) == "true" ]] && nginx_tool_site
|
||||||
nginx_tool_site
|
|
||||||
fi
|
|
||||||
# in case php was installed before nginx
|
# in case php was installed before nginx
|
||||||
if [[ $(conf_read php-tool) == "true" && ! -a /var/www/$(conf_read tools-port)/htdocs/php/index.php ]]; then
|
[[ $(conf_read php-tool) == "true" && ! -a /var/www/$(conf_read tools-port)/htdocs/php/index.php ]] && php_tool_site
|
||||||
php_tool_site
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Instalar Duply & Duplicity
|
# Instalar Duply & Duplicity
|
||||||
pre_install
|
pre_install
|
||||||
|
|
|
@ -61,22 +61,15 @@ elif [[ $opt == "-dbpass" ]]; then
|
||||||
|
|
||||||
|
|
||||||
elif [[ $opt == "-tools-port" ]]; then
|
elif [[ $opt == "-tools-port" ]]; then
|
||||||
if [[ $(conf_read nginx-tool) == "true" && $(conf_read nginx) == "true" ]]; then
|
|
||||||
oldport="$(conf_read tools-port)"
|
oldport="$(conf_read tools-port)"
|
||||||
[[ -n $value ]] && tools_port $value || tools_port
|
[[ -n $value ]] && tools_port $value || tools_port
|
||||||
newport="$(conf_read tools-port)"
|
newport="$(conf_read tools-port)"
|
||||||
if [[ $oldport != $newport ]]; then
|
if [[ $oldport != $newport && $(conf_read nginx-tool) == "true" && $(conf_read nginx) == "true" ]]; then
|
||||||
sudo mv /var/www/$oldport /var/www/$newport
|
sudo mv /var/www/$oldport /var/www/$newport
|
||||||
sudo mv /etc/nginx/sites-available/$oldport /etc/nginx/sites-available/$newport
|
sudo mv /etc/nginx/sites-available/$oldport /etc/nginx/sites-available/$newport
|
||||||
sudo rm /etc/nginx/sites-enabled/$oldport
|
sudo rm /etc/nginx/sites-enabled/$oldport
|
||||||
sudo ln -s /etc/nginx/sites-available/$newport /etc/nginx/sites-enabled/$newport
|
sudo ln -s /etc/nginx/sites-available/$newport /etc/nginx/sites-enabled/$newport
|
||||||
sudo sed -i "s/${oldport}/${newport}/g" /etc/nginx/sites-available/$newport
|
sudo sed -i "s/${oldport}/${newport}/g" /etc/nginx/sites-available/$newport
|
||||||
sudo service nginx reload
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "${red}"
|
|
||||||
echo "Nginx Tools not found in your server!"
|
|
||||||
echo "${end}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
6
weby
6
weby
|
@ -72,12 +72,10 @@ source /opt/webinoly/lib/install
|
||||||
[[ -a $HOME/.webinoly-conf-restore_dont-remove ]] && sudo mv $HOME/.webinoly-conf-restore_dont-remove /opt/webinoly/webinoly.conf
|
[[ -a $HOME/.webinoly-conf-restore_dont-remove ]] && sudo mv $HOME/.webinoly-conf-restore_dont-remove /opt/webinoly/webinoly.conf
|
||||||
|
|
||||||
# Save Tools Port after library is available.
|
# Save Tools Port after library is available.
|
||||||
if [[ -a /opt/webinoly/webinoly.conf && -n $(conf_read tools-port) ]]; then
|
if [[ -a /opt/webinoly/webinoly.conf ]]; then
|
||||||
echo "${gre}Webinoly Configuration file was found, so we will use it!${end}"
|
echo "${gre}Webinoly Configuration file was found, so we will use it!${end}"
|
||||||
else
|
else
|
||||||
portools="22222"
|
[[ -n $2 && $2 != "-ver="* ]] && tools_port $2
|
||||||
[[ -n $2 && $2 != "-ver="* ]] && portools="$2"
|
|
||||||
tools_port $portools
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Write app version
|
# Write app version
|
||||||
|
|
Loading…
Reference in a new issue