Install v4 and upgrade (#1149)

* Install v4 and upgrade

* update install

* review

* remove misleading comments

Author: saeedvaziry

scripts/install.sh

@@ -56,19 +56,16 @@ chown -R vito:vito /home/vito
 chsh -s /bin/bash "vito"
 su - "vito" -c "ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa" <<< y
 
-# upgrade
 apt clean
+rm -f /etc/apt/sources.list.d/*ondrej*php* 2>/dev/null || true
 apt update
 apt upgrade -y
 apt autoremove -y
 
-# requirements
 apt install -y software-properties-common curl zip unzip git gcc
 
-# certbot
 apt install certbot python3-certbot-nginx -y
 
-# nginx
 export V_NGINX_CONFIG="
     user vito;
     worker_processes auto;
@@ -85,7 +82,7 @@ export V_NGINX_CONFIG="
         types_hash_max_size 2048;
         include /etc/nginx/mime.types;
         default_type application/octet-stream;
-        ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+        ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_prefer_server_ciphers on;
         access_log /var/log/nginx/access.log;
         error_log /var/log/nginx/error.log;
@@ -100,37 +97,47 @@ if ! echo "${V_NGINX_CONFIG}" | tee /etc/nginx/nginx.conf; then
 fi
 service nginx start
 
-# nodejs
 export V_NODE_VERSION="20.x"
 curl -fsSL https://deb.nodesource.com/setup_${V_NODE_VERSION} | sudo -E bash -
 apt install -y nodejs
 
-# php
-export V_PHP_VERSION="8.4"
-add-apt-repository ppa:ondrej/php -y
-apt update
-apt install -y php${V_PHP_VERSION} php${V_PHP_VERSION}-fpm php${V_PHP_VERSION}-mbstring php${V_PHP_VERSION}-mcrypt php${V_PHP_VERSION}-gd php${V_PHP_VERSION}-xml php${V_PHP_VERSION}-curl php${V_PHP_VERSION}-gettext php${V_PHP_VERSION}-zip php${V_PHP_VERSION}-bcmath php${V_PHP_VERSION}-soap php${V_PHP_VERSION}-redis php${V_PHP_VERSION}-sqlite3 php${V_PHP_VERSION}-intl
+. /etc/os-release
+export V_DISTRO_CODENAME="${UBUNTU_CODENAME:-${VERSION_CODENAME}}"
+
+if curl -fsSL "https://ppa.launchpadcontent.net/ondrej/php/ubuntu/dists/${V_DISTRO_CODENAME}/Release" -o /dev/null; then
+  export V_PHP_VERSION="8.4"
+  add-apt-repository ppa:ondrej/php -y
+  apt update
+else
+  echo "ondrej/php has no packages for '${V_DISTRO_CODENAME}'; using the distribution's PHP."
+  apt update
+  V_PHP_VERSION=$(apt-cache search --names-only '^php[0-9]+\.[0-9]+-fpm$' | grep -oE '^php[0-9]+\.[0-9]+-fpm' | grep -oE '[0-9]+\.[0-9]+' | sort -V | tail -n 1)
+  export V_PHP_VERSION
+fi
+
+if [[ -z "${V_PHP_VERSION}" ]]; then
+  echo "Error: could not determine a PHP version to install for '${V_DISTRO_CODENAME}'." && exit 1
+fi
+
+echo "Installing PHP ${V_PHP_VERSION}..."
+apt install -y php${V_PHP_VERSION} php${V_PHP_VERSION}-fpm php${V_PHP_VERSION}-mbstring php${V_PHP_VERSION}-gd php${V_PHP_VERSION}-xml php${V_PHP_VERSION}-curl php${V_PHP_VERSION}-zip php${V_PHP_VERSION}-bcmath php${V_PHP_VERSION}-soap php${V_PHP_VERSION}-redis php${V_PHP_VERSION}-sqlite3 php${V_PHP_VERSION}-intl
 if ! sed -i "s/www-data/vito/g" /etc/php/${V_PHP_VERSION}/fpm/pool.d/www.conf; then
   echo 'Error installing PHP' && exit 1
 fi
-service php${V_PHP_VERSION}-fpm enable
+systemctl enable php${V_PHP_VERSION}-fpm
 service php${V_PHP_VERSION}-fpm start
-apt install -y php${V_PHP_VERSION}-ssh2
 service php${V_PHP_VERSION}-fpm restart
 sed -i "s/memory_limit = .*/memory_limit = 1G/" /etc/php/${V_PHP_VERSION}/fpm/php.ini
 sed -i "s/upload_max_filesize = .*/upload_max_filesize = 1G/" /etc/php/${V_PHP_VERSION}/fpm/php.ini
 sed -i "s/post_max_size = .*/post_max_size = 1G/" /etc/php/${V_PHP_VERSION}/fpm/php.ini
 
-# composer
 curl -sS https://getcomposer.org/installer -o composer-setup.php
 php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 
-# redis
 apt install redis-server -y
 service redis enable
 service redis start
 
-# setup website
 export COMPOSER_ALLOW_SUPERUSER=1
 export V_REPO="https://github.com/vitodeploy/vito.git"
 export V_VHOST_CONFIG="
@@ -222,13 +229,10 @@ ssh-keygen -y -f /home/vito/vito/storage/ssh-private.pem > /home/vito/vito/stora
 chown -R vito:vito /home/vito/vito/storage/ssh-private.pem
 chown -R vito:vito /home/vito/vito/storage/ssh-public.key
 
-# optimize
 php artisan optimize
 
-# cleanup
 chown -R vito:vito /home/vito
 
-# setup supervisor
 export V_WORKER_CONFIG="
 [program:worker]
 process_name=%(program_name)s_%(process_num)02d
@@ -248,7 +252,6 @@ mkdir -p /home/vito/.logs/workers
 touch /home/vito/.logs/workers/worker.log
 echo "${V_WORKER_CONFIG}" | tee /etc/supervisor/conf.d/worker.conf
 
-# websocket server
 export V_WEBSOCKET_CONFIG="
 [program:websocket]
 process_name=%(program_name)s
@@ -264,14 +267,11 @@ echo "${V_WEBSOCKET_CONFIG}" | tee /etc/supervisor/conf.d/websocket.conf
 supervisorctl reread
 supervisorctl update
 
-# start worker
 supervisorctl start worker:*
 supervisorctl start websocket
 
-# setup cronjobs
 echo "* * * * * cd /home/vito/vito && php artisan schedule:run >> /dev/null 2>&1" | sudo -u vito crontab -
 
-# print info
 echo "🎉 Congratulations!"
 echo "✅ You can access Vito at: ${VITO_APP_URL}"
 echo "✅ SSH User: vito"

scripts/upgrade-3x-to-4x.sh

@@ -1,16 +1,27 @@
 #!/bin/bash
+set -uo pipefail
 
 echo "Upgrading Vito from 3.x to 4.x"
 
+VITO_DIR="/home/vito/vito"
+NGINX_VHOST="/etc/nginx/sites-available/vito"
+
+export COMPOSER_ALLOW_SUPERUSER=1
+
 echo "Getting started"
-cd /home/vito/vito
-git stash
-sudo chown -R vito:vito /home/vito/vito
-
-# Add websocket proxy to nginx
-if ! grep -q "location /ws/" /etc/nginx/sites-available/vito; then
-  echo "Configuring Nginx for websocket support..."
-  sudo sed -i '/location ~ \/\\.(?!well-known).*/i \
+cd "${VITO_DIR}" || { echo "❌ ${VITO_DIR} not found — is Vito installed here?" >&2; exit 1; }
+
+trap 'sudo chown -R vito:vito "${VITO_DIR}" 2>/dev/null || true' EXIT
+
+git reset --hard HEAD
+git clean -fd
+sudo chown -R vito:vito "${VITO_DIR}"
+
+if [ -f "${NGINX_VHOST}" ]; then
+  if ! grep -q "location /ws/" "${NGINX_VHOST}"; then
+    echo "Configuring Nginx for websocket support..."
+    sudo cp "${NGINX_VHOST}" "${NGINX_VHOST}.pre-4x.bak"
+    sudo sed -i '/location ~ \/\\.(?!well-known).*/i \
     location /ws/ {\
         proxy_pass http://127.0.0.1:8085;\
         proxy_http_version 1.1;\
@@ -20,11 +31,27 @@ if ! grep -q "location /ws/" /etc/nginx/sites-available/vito; then
         proxy_set_header X-Real-IP $remote_addr;\
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\
         proxy_read_timeout 86400;\
-    }' /etc/nginx/sites-available/vito
-  sudo service nginx restart
+    }' "${NGINX_VHOST}"
+
+    if ! grep -q "location /ws/" "${NGINX_VHOST}"; then
+      echo "❌ Could not insert the /ws/ block into ${NGINX_VHOST}; restoring backup. Add it manually." >&2
+      sudo cp "${NGINX_VHOST}.pre-4x.bak" "${NGINX_VHOST}"
+      exit 1
+    fi
+
+    if sudo nginx -t; then
+      sudo service nginx restart
+    else
+      echo "❌ nginx config test failed after edit; restoring backup." >&2
+      sudo cp "${NGINX_VHOST}.pre-4x.bak" "${NGINX_VHOST}"
+      sudo service nginx restart || true
+      exit 1
+    fi
+  fi
+else
+  echo "⚠️  ${NGINX_VHOST} not found. Manually add a '/ws/' -> 127.0.0.1:8085 proxy to your Vito vhost so websockets/terminal work." >&2
 fi
 
-# Add websocket supervisor configuration
 if [ ! -f /etc/supervisor/conf.d/websocket.conf ]; then
   echo "Adding websocket supervisor configuration..."
   sudo mkdir -p /home/vito/.logs/workers
@@ -42,9 +69,16 @@ stdout_logfile=/home/vito/.logs/workers/websocket.log
 " | sudo tee /etc/supervisor/conf.d/websocket.conf
   sudo supervisorctl reread
   sudo supervisorctl update
+  sudo supervisorctl start websocket 2>/dev/null || true
 fi
 
 echo "Fetching the latest release"
-git fetch
-git checkout 4.x
-bash scripts/update.sh
+git fetch --all --tags
+git checkout 4.x || { echo "❌ Failed to checkout the 4.x branch." >&2; exit 1; }
+
+if ! bash scripts/update.sh "$@"; then
+  echo "❌ update.sh failed. If 4.x is still in beta, re-run with: sudo bash scripts/upgrade-3x-to-4x.sh --beta" >&2
+  exit 1
+fi
+
+echo "✅ Upgrade to 4.x complete."