From 38a75440a55c57a09d765bd6f449e043e7c4348e Mon Sep 17 00:00:00 2001 From: ramvignesh-b Date: Mon, 4 May 2026 21:26:28 +0530 Subject: [PATCH] chore: increment default backend and database ports and improve setup script environment initialization --- .env.e2e.example | 6 +++--- .env.example | 6 +++--- scripts/setup.sh | 33 ++++++++++++++++++++++----------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.env.e2e.example b/.env.e2e.example index f63a9fa..fca294e 100644 --- a/.env.e2e.example +++ b/.env.e2e.example @@ -3,7 +3,7 @@ DB_NAME=piku_test_db DB_USER=test DB_PASSWORD=password123 DB_HOST=127.0.0.1 -DB_PORT=5433 +DB_PORT=5443 # SSL SSL_ENABLED=true @@ -12,7 +12,7 @@ SSL_ENABLED=true DEBUG=True SECRET_KEY=django-insecure-initial-key BACKEND_DOMAIN=127.0.0.1 -BACKEND_PORT=8001 +BACKEND_PORT=8101 # EMAIL EMAIL_HOST=127.0.0.1 @@ -25,4 +25,4 @@ EMAIL_API_PORT=8026 # FRONTEND FRONTEND_PORT=5199 FRONTEND_DOMAIN=127.0.0.1 -VITE_API_URL=https://127.0.0.1:8001 +VITE_API_URL=https://127.0.0.1:8101 diff --git a/.env.example b/.env.example index 9981b60..8294e9c 100644 --- a/.env.example +++ b/.env.example @@ -3,7 +3,7 @@ DB_NAME=piku DB_USER=user DB_PASSWORD=password123 DB_HOST=127.0.0.1 -DB_PORT=5432 +DB_PORT=5442 # SSL SSL_ENABLED=true @@ -13,7 +13,7 @@ S3_ENABLED=false DEBUG=True SECRET_KEY=django-secret-key BACKEND_DOMAIN=127.0.0.1 -BACKEND_PORT=8000 +BACKEND_PORT=8100 # S3 R2_ACCESS_KEY_ID= R2_SECRET_ACCESS_KEY= @@ -31,4 +31,4 @@ FROM_EMAIL="Pi Ku " # FRONTEND FRONTEND_PORT=5173 FRONTEND_DOMAIN=127.0.0.1 -VITE_API_URL=https://127.0.0.1:8000 +VITE_API_URL=https://127.0.0.1:8100 diff --git a/scripts/setup.sh b/scripts/setup.sh index 7686179..97e8a71 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,6 +1,14 @@ #!/bin/bash set -e +# Setup Env from examples +if [ ! -f ".env" ]; then + cp .env.example .env +fi +if [ ! -f ".env.e2e" ]; then + cp .env.e2e.example .env.e2e +fi + NODE_BIN=$(command -v bun || command -v npm || true) PY_BIN=$(command -v uv || command -v pip || true) DISTRO_BIN=$(command -v apt || command -v yum || command -v pacman || command -v zypper || true) @@ -35,17 +43,20 @@ else fi # Simplify ssl generation for local - source & credits:- https://github.com/FiloSottile/mkcert -echo "[Cert] Setting up SSL..." -# pre-requisites (might be available already, just in case) -if [ $(basename "$DISTRO_BIN") = "apt" ]; then - sudo apt install -y libnss3-tools -elif [ $(basename "$DISTRO_BIN") = "yum" ]; then - sudo yum install -y nss-tools -elif [ $(basename "$DISTRO_BIN") = "pacman" ]; then - sudo pacman -S --noconfirm nss -elif [ $(basename "$DISTRO_BIN") = "zypper" ]; then - sudo zypper install -y mozilla-nss-tools -fi +# Note, still try to perform the setup if pkg setups fail +{ + echo "[Cert] Setting up SSL..." + # pre-requisites (might be available already, just in case) + if [ $(basename "$DISTRO_BIN") = "apt" ]; then + sudo apt install -y libnss3-tools + elif [ $(basename "$DISTRO_BIN") = "yum" ]; then + sudo yum install -y nss-tools + elif [ $(basename "$DISTRO_BIN") = "pacman" ]; then + sudo pacman -S --noconfirm nss + elif [ $(basename "$DISTRO_BIN") = "zypper" ]; then + sudo zypper install -y mozilla-nss-tools + fi +} || true # Detect os and arch to get the appropriate bin. Windows: ...NO SOUP FOR YOU! OS=$(uname -s)