diff --git a/lib/install b/lib/install index ee49bcb..835cb8a 100644 --- a/lib/install +++ b/lib/install @@ -298,6 +298,7 @@ php_optim() { nginx_tool_site() { # Port 22222 tools site + [[ -z $(conf_read tools-port) ]] && tools_port 22222 sudo site $(conf_read tools-port) -php 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) @@ -306,13 +307,9 @@ nginx_tool_site() { nginx_tool() { - if [[ $(conf_read php) == "true" ]]; then - nginx_tool_site - fi + [[ $(conf_read php) == "true" ]] && nginx_tool_site # 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 - php_tool_site - fi + [[ $(conf_read php-tool) == "true" && ! -a /var/www/$(conf_read tools-port)/htdocs/php/index.php ]] && php_tool_site # Instalar Duply & Duplicity pre_install diff --git a/plugins/webinoly b/plugins/webinoly index 1e9c27c..f53a8bb 100644 --- a/plugins/webinoly +++ b/plugins/webinoly @@ -61,22 +61,15 @@ elif [[ $opt == "-dbpass" ]]; then elif [[ $opt == "-tools-port" ]]; then - if [[ $(conf_read nginx-tool) == "true" && $(conf_read nginx) == "true" ]]; then - oldport="$(conf_read tools-port)" - [[ -n $value ]] && tools_port $value || tools_port - newport="$(conf_read tools-port)" - if [[ $oldport != $newport ]]; then - sudo mv /var/www/$oldport /var/www/$newport - sudo mv /etc/nginx/sites-available/$oldport /etc/nginx/sites-available/$newport - sudo rm /etc/nginx/sites-enabled/$oldport - 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 service nginx reload - fi - else - echo "${red}" - echo "Nginx Tools not found in your server!" - echo "${end}" + oldport="$(conf_read tools-port)" + [[ -n $value ]] && tools_port $value || tools_port + newport="$(conf_read tools-port)" + if [[ $oldport != $newport && $(conf_read nginx-tool) == "true" && $(conf_read nginx) == "true" ]]; then + sudo mv /var/www/$oldport /var/www/$newport + sudo mv /etc/nginx/sites-available/$oldport /etc/nginx/sites-available/$newport + sudo rm /etc/nginx/sites-enabled/$oldport + 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 fi diff --git a/weby b/weby index a59a18a..17be411 100644 --- a/weby +++ b/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 # 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}" else - portools="22222" - [[ -n $2 && $2 != "-ver="* ]] && portools="$2" - tools_port $portools + [[ -n $2 && $2 != "-ver="* ]] && tools_port $2 fi # Write app version