Update 'Main-Installer.sh'

This commit is contained in:
tbergervoet
2018-10-17 14:39:02 +02:00
parent d142f1fd09
commit 4333436cf3

View File

@@ -28,16 +28,11 @@ do
"Apache") "Apache")
script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/Apache-Installer.sh script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/Apache-Installer.sh
break;; break;;
<<<<<<< HEAD
"Apache, Nginx reverse proxy")
script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/RevProxySimple.sh
=======
"Nginx proxy") "Nginx proxy")
script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/dev/RevProxySimple.sh script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/RevProxySimple.sh
>>>>>>> dev
break;; break;;
"Nginx proxy & standalone") "Nginx proxy & standalone")
script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/dev/RevProxyAdvanced.sh script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/RevProxyAdvanced.sh
break;; break;;
"Nginx, PHP-FPM") "Nginx, PHP-FPM")
script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/NGINX-Installer.sh script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/NGINX-Installer.sh
@@ -198,8 +193,6 @@ if [ $cockpit = 1 ]; then
source Slave-Installer.sh source Slave-Installer.sh
fi fi
##-------------------## ##-------------------##
# Backup Script # # Backup Script #
##-------------------## ##-------------------##
@@ -208,8 +201,6 @@ wget https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Backup/raw/branch/master/WP_
echo "Installatie geslaagd!" echo "Installatie geslaagd!"
##------------## ##------------##