Skip to content

Commit 5d61785

Browse files
VirtuBoxVirtuBox
committed
remove useless config
1 parent 55e8add commit 5d61785

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎wo-nginx-setup.sh

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -185,18 +185,18 @@ if [ "$INTERACTIVE_SETUP" = "y" ]; then
185185
fi
186186
sleep 1
187187
fi
188-
if [ ! -d /etc/php/7.3/fpm/pool.d ]; then
189-
echo ""
190-
echo "#####################################"
191-
echo "PHP"
192-
echo "#####################################"
193-
echo ""
194-
echo "Do you want to install PHP 7.3 ? (y/n)"
195-
while [[ $PHP73_INSTALL != "y" && $PHP73_INSTALL != "n" ]]; do
196-
read -p "Select an option [y/n]: " PHP73_INSTALL
197-
done
198-
fi
199-
sleep 1
188+
# if [ ! -d /etc/php/7.3/fpm/pool.d ]; then
189+
# echo ""
190+
# echo "#####################################"
191+
# echo "PHP"
192+
# echo "#####################################"
193+
# echo ""
194+
# echo "Do you want to install PHP 7.3 ? (y/n)"
195+
# while [[ $PHP73_INSTALL != "y" && $PHP73_INSTALL != "n" ]]; do
196+
# read -p "Select an option [y/n]: " PHP73_INSTALL
197+
# done
198+
# fi
199+
# sleep 1
200200
echo ""
201201
if [ ! -d /etc/proftpd ]; then
202202
echo ""
@@ -591,9 +591,9 @@ if [ -z "$WO_PREVIOUS_INSTALL" ]; then
591591
# install nginx, php, postfix, memcached
592592
/usr/local/bin/wo stack install
593593
# install php7, redis, easyengine backend & phpredisadmin
594-
/usr/local/bin/wo stack install --redis --admin --phpredisadmin
594+
/usr/local/bin/wo stack install --redis --php73 --admin --phpredisadmin
595595
else
596-
/usr/local/bin/wo stack install --nginx --php --redis --wpcli
596+
/usr/local/bin/wo stack install --nginx --php73 --redis --wpcli
597597
fi
598598

599599
##################################
@@ -643,42 +643,42 @@ if [ -z "$WO_PREVIOUS_INSTALL" ]; then
643643
sudo -u www-data -H curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh
644644
fi
645645

646-
##################################
647-
# Install php7.2-fpm
648-
##################################
646+
# ##################################
647+
# # Install php7.2-fpm
648+
# ##################################
649649

650-
echo "##########################################"
651-
echo " Installing php7.2-fpm"
652-
echo "##########################################"
650+
# echo "##########################################"
651+
# echo " Installing php7.2-fpm"
652+
# echo "##########################################"
653653

654-
sudo apt-get install php7.2-fpm php7.2-xml php7.2-bz2 php7.2-zip php7.2-mysql php7.2-intl php7.2-gd \
655-
php7.2-curl php7.2-soap php7.2-mbstring php7.2-xsl php7.2-bcmath -y
654+
# sudo apt-get install php7.2-fpm php7.2-xml php7.2-bz2 php7.2-zip php7.2-mysql php7.2-intl php7.2-gd \
655+
# php7.2-curl php7.2-soap php7.2-mbstring php7.2-xsl php7.2-bcmath -y
656656

657-
# copy php7.2 config files
658-
sudo cp -rf $HOME/ubuntu-nginx-web-server/etc/php/7.2/* /etc/php/7.2/
659-
sudo service php7.2-fpm restart
657+
# # copy php7.2 config files
658+
# sudo cp -rf $HOME/ubuntu-nginx-web-server/etc/php/7.2/* /etc/php/7.2/
659+
# sudo service php7.2-fpm restart
660660

661-
# commit changes
662-
git -C /etc/php/ add /etc/php/ && git -C /etc/php/ commit -m "add php7.2 configuration"
661+
# # commit changes
662+
# git -C /etc/php/ add /etc/php/ && git -C /etc/php/ commit -m "add php7.2 configuration"
663663

664-
if [ "$PHP73_INSTALL" = "y" ]; then
664+
# if [ "$PHP73_INSTALL" = "y" ]; then
665665

666-
##################################
667-
# Install php7.3-fpm
668-
##################################
666+
# ##################################
667+
# # Install php7.3-fpm
668+
# ##################################
669669

670-
echo "##########################################"
671-
echo " Installing php7.3-fpm"
672-
echo "##########################################"
670+
# echo "##########################################"
671+
# echo " Installing php7.3-fpm"
672+
# echo "##########################################"
673673

674-
sudo apt-get install php7.3-fpm php7.3-xml php7.3-bz2 php7.3-zip php7.3-mysql php7.3-intl php7.3-gd php7.3-curl php7.3-soap php7.3-mbstring php7.3-bcmath -y
674+
# sudo apt-get install php7.3-fpm php7.3-xml php7.3-bz2 php7.3-zip php7.3-mysql php7.3-intl php7.3-gd php7.3-curl php7.3-soap php7.3-mbstring php7.3-bcmath -y
675675

676-
sudo cp -rf $HOME/ubuntu-nginx-web-server/etc/php/7.3/* /etc/php/7.3/
677-
sudo service php7.3-fpm restart
676+
# sudo cp -rf $HOME/ubuntu-nginx-web-server/etc/php/7.3/* /etc/php/7.3/
677+
# sudo service php7.3-fpm restart
678678

679-
git -C /etc/php/ add /etc/php/ && git -C /etc/php/ commit -m "add php7.3 configuration"
679+
# git -C /etc/php/ add /etc/php/ && git -C /etc/php/ commit -m "add php7.3 configuration"
680680

681-
fi
681+
# fi
682682

683683
##################################
684684
# Compile latest nginx release from source
@@ -736,19 +736,19 @@ rm $HOME/nginx-cloudflare-real-ip.sh
736736
# commit changes
737737
git -C /etc/nginx/ add /etc/nginx/ && git -C /etc/nginx/ commit -m "update nginx.conf and setup cloudflare visitor real IP restore"
738738

739-
# check nginx configuration
740-
CONF_22222=$(grep -c netdata /etc/nginx/sites-available/22222)
741-
CONF_UPSTREAM=$(grep -c netdata /etc/nginx/conf.d/upstream.conf)
739+
# # check nginx configuration
740+
# CONF_22222=$(grep netdata /etc/nginx/sites-available/22222)
741+
# CONF_UPSTREAM=$(grep netdata /etc/nginx/conf.d/upstream.conf)
742742

743-
if [ "$CONF_22222" = "0" ]; then
744-
# add nginx reverse-proxy for netdata on https://yourserver.hostname:22222/netdata/
745-
sudo cp -f $HOME/ubuntu-nginx-web-server/etc/nginx/sites-available/22222 /etc/nginx/sites-available/22222
746-
fi
743+
# if [ -z "$CONF_22222" ]; then
744+
# # add nginx reverse-proxy for netdata on https://yourserver.hostname:22222/netdata/
745+
# sudo cp -f $HOME/ubuntu-nginx-web-server/etc/nginx/sites-available/22222 /etc/nginx/sites-available/22222
746+
# fi
747747

748-
if [ "$CONF_UPSTREAM" = "0" ]; then
749-
# add netdata, php7.1 and php7.2 upstream
750-
sudo cp -f $HOME/ubuntu-nginx-web-server/etc/nginx/conf.d/upstream.conf /etc/nginx/conf.d/upstream.conf
751-
fi
748+
# if [ -z "$CONF_UPSTREAM" ]; then
749+
# # add netdata, php7.1 and php7.2 upstream
750+
# sudo cp -f $HOME/ubuntu-nginx-web-server/etc/nginx/conf.d/upstream.conf /etc/nginx/conf.d/upstream.conf
751+
# fi
752752

753753
VERIFY_NGINX_CONFIG=$(nginx -t 2>&1 | grep failed)
754754
echo "##########################################"
@@ -1012,7 +1012,7 @@ if [ "$EE_CLEANUP" = "y" ]; then
10121012
tar -I pigz -cvf $HOME/ee-backup.tar.gz /etc/ee /var/lib/ee /usr/lib/ee/templates
10131013
echo "Backup of the previous EasyEngine configurations is available here : $HOME/ee-backup.tar.gz"
10141014

1015-
rm -rf /etc/ee /var/lib/ee /usr/lib/ee
1015+
rm -rf /etc/ee /var/lib/ee /usr/lib/ee /usr/local/bin/ee /etc/bash_completion.d/ee_auto.rc
10161016
rm -rf /usr/local/lib/python3.6/dist-packages/ee-3.*
10171017

10181018
apt-get -y autoremove php5.6-fpm php5.6-common --purge

0 commit comments

Comments
 (0)