Merge pull request #5 from coundia/dev

Dev

Author: coundia

.github/workflows/deploy.yml

@@ -26,7 +26,7 @@ jobs:
           name: astro-build
           path: dist/
 
-  deploy:
+  deploy-on-test:
     needs: build
     runs-on: ubuntu-latest
     steps:
@@ -36,7 +36,57 @@ jobs:
           name: astro-build
           path: dist/
 
-      - name: Deploy to OVH Server
+      - name: Deploy to test OVH Server
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SERVER_USER: ${{ secrets.SERVER_USER }}
+          SERVER_IP: ${{ secrets.SERVER_IP }}
+          SERVER_PATH: "/var/www/test.pcoundia.com/"
+        run: |
+          # Vérification des variables
+          if [[ -z "$SSH_PRIVATE_KEY" || -z "$SERVER_USER" || -z "$SERVER_IP" ]]; then
+            echo "Error: Missing environment variables!"
+            exit 1
+          fi
+          
+          # Configure SSH for access
+          mkdir -p ~/.ssh
+          echo "$SSH_PRIVATE_KEY" | tr -d '\r' | tee ~/.ssh/id_rsa > /dev/null
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
+          
+          # Test SSH connection
+          ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "echo 'SSH connection successful'"
+
+          # Deploy to the test server
+          rsync -avz --chown=$SERVER_USER:www-data --chmod=775 --delete dist/ "$SERVER_USER@$SERVER_IP:$SERVER_PATH"
+
+  test:
+    runs-on: ubuntu-latest
+    needs: deploy-on-test
+    steps:
+      - name: Checkout Selenium Tests Repository
+        run: |
+          git clone https://github.com/coundia/selenium-java-pcoundia.git selenium-tests
+
+      - name: Run Selenium Tests
+        env:
+          SERVER_URL: "https://test.pcoundia.com"  # Point to your test server URL
+        run: |
+          cd selenium-tests
+          mvn clean test -Dapp.url=$SERVER_URL
+
+  deploy-on-prod:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: astro-build
+          path: dist/
+
+      - name: Deploy to prod OVH Server
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           SERVER_USER: ${{ secrets.SERVER_USER }}
@@ -49,14 +99,14 @@ jobs:
             exit 1
           fi
           
-          # Configuration of SSH
+          # Configure SSH for access
           mkdir -p ~/.ssh
           echo "$SSH_PRIVATE_KEY" | tr -d '\r' | tee ~/.ssh/id_rsa > /dev/null
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
           
-          # Test SSH
+          # Test SSH connection
           ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "echo 'SSH connection successful'"
- 
+
+          # Deploy to the production server
           rsync -avz --chown=$SERVER_USER:www-data --chmod=775 --delete dist/ "$SERVER_USER@$SERVER_IP:$SERVER_PATH"
- 

DOC/deploy.test.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Configuration
+DOMAIN="test.pcoundia.com"
+PROJECT_DIR="/var/www/test.pcoundia.com"
+GIT_REPO="[email protected]:coundia/astro_angular_tailwindcss_portfolio.git"
+
+echo "🚀 Mise à jour des paquets..."
+sudo apt update && sudo apt upgrade -y
+
+echo "📦 Installation des dépendances..."
+sudo apt install -y curl software-properties-common unzip git nginx certbot python3-certbot-nginx
+
+echo "🛠️ Génération du certificat SSL avant la configuration de Nginx..."
+sudo certbot certonly --standalone -d $DOMAIN -d www.$DOMAIN --non-interactive --agree-tos -m admin@$DOMAIN
+
+sudo rm /etc/nginx/sites-available/$DOMAIN
+sudo rm /etc/nginx/sites-enabled/$DOMAIN
+
+echo "🔧 Configuration de Nginx pour $DOMAIN..."
+sudo bash -c "cat > /etc/nginx/sites-available/$DOMAIN <<EOF
+server {
+    listen 80;
+    server_name $DOMAIN www.$DOMAIN;
+    return 301 https://\$host\$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name $DOMAIN www.$DOMAIN;
+    root $PROJECT_DIR;
+    index index.html;
+
+    ssl_certificate /etc/letsencrypt/live/$DOMAIN/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/$DOMAIN/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+    # Gestion des routes Angular
+    location / {
+        index index.html;
+        try_files \\\$uri \\\$uri \\\$uri/index.html /index.html;
+    }
+
+    error_log /var/log/nginx/$DOMAIN.error.log;
+    access_log /var/log/nginx/$DOMAIN.access.log;
+}
+EOF"
+
+sudo ln -sf /etc/nginx/sites-available/$DOMAIN /etc/nginx/sites-enabled/
+sudo systemctl restart nginx
+
+echo "🔧 Configuration des permissions..."
+sudo chown -R www-data:www-data $PROJECT_DIR
+sudo chmod -R 775 $PROJECT_DIR
+
+echo "🛠️ Vérification de la configuration Nginx..."
+sudo nginx -t && sudo systemctl reload nginx
+
+echo "✅ Déploiement terminé avec succès !"
+echo "🌍 Accédez à https://$DOMAIN pour voir votre site."