lexton-it/NextWks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: install.sh no presets, random password, copies local code instead of cloning

Browse source
This commit is contained in:
Claus Lohmar 2026-07-07 17:06:54 +01:00
parent e03cb76017
commit 585d4e6ec8
1 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
install.sh
View file

@ -6,6 +6,7 @@ set -euo pipefail
TARGET_DIR="/opt/nextworkspace" TARGET_DIR="/opt/nextworkspace"
BACKUP_DIR="/opt/backup" BACKUP_DIR="/opt/backup"
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
# --- Create backup vault and runtime directories --- # --- Create backup vault and runtime directories ---
echo "=== NextWorkspace Setup ===" echo "=== NextWorkspace Setup ==="
@ -17,23 +18,29 @@ mkdir -p "$TARGET_DIR/data/zoraxy"
mkdir -p "$TARGET_DIR/compose" mkdir -p "$TARGET_DIR/compose"
mkdir -p "$TARGET_DIR/logs" mkdir -p "$TARGET_DIR/logs"
# --- Interactive prompts --- # --- Interactive prompts (no defaults — user enters everything) ---
read -p "Domain [nextwks.eu]: " DOMAIN read -p "Domain: " DOMAIN
DOMAIN="${DOMAIN:-nextwks.eu}" while [ -z "$DOMAIN" ]; do
read -p "Domain (required): " DOMAIN
done
read -p "TLS email (Let's Encrypt) [den@2-4-h.net]: " TLS_EMAIL read -p "TLS email (Let's Encrypt): " TLS_EMAIL
TLS_EMAIL="${TLS_EMAIL:-den@2-4-h.net}" while [ -z "$TLS_EMAIL" ]; do
read -p "TLS email (required): " TLS_EMAIL
done
read -p "Admin username [master]: " ADMIN_USERNAME read -p "Admin username: " ADMIN_USERNAME
ADMIN_USERNAME="${ADMIN_USERNAME:-master}" while [ -z "$ADMIN_USERNAME" ]; do
read -p "Admin username (required): " ADMIN_USERNAME
done
read -p "Admin password [auto-generated]: " ADMIN_PASSWORD # Generate strong random password
if [ -z "$ADMIN_PASSWORD" ]; then ADMIN_PASSWORD=$(tr -dc 'A-Za-z0-9!@#$%^&*()_+-=' < /dev/urandom | head -c 20 2>/dev/null || echo "NextWks$(date +%s)")
ADMIN_PASSWORD="9Aku7MfklZU9ldnZ"
fi
echo "" echo ""
echo "========================================" echo "========================================"
echo " Domain: $DOMAIN"
echo " TLS email: $TLS_EMAIL"
echo " Admin username: $ADMIN_USERNAME" echo " Admin username: $ADMIN_USERNAME"
echo " Admin password: $ADMIN_PASSWORD" echo " Admin password: $ADMIN_PASSWORD"
echo " Save this password — it won't be shown again!" echo " Save this password — it won't be shown again!"
@ -74,18 +81,17 @@ echo "[INSTALL] git, build-essential, podman, podman-compose..."
apt-get update -qq apt-get update -qq
apt-get install -y -qq git build-essential curl podman podman-compose apt-get install -y -qq git build-essential curl podman podman-compose
# ---- Clone / pull repo ---- # ---- Deploy: use current scripts + tools ---
REPO_DIR="/opt/NextWks" REPO_DIR="/opt/NextWks"
REPO_URL="https://git.lohmar.co.uk/lexton-it/NextWks.git" mkdir -p "$REPO_DIR"
if [ -d "$REPO_DIR/.git" ]; then # Copy current code to REPO_DIR (includes all latest changes)
echo "[UPDATE] Repository exists — pulling latest..." echo "[COPY] Deploying current code to $REPO_DIR..."
cd "$REPO_DIR" cp -r "$SCRIPT_DIR"/* "$REPO_DIR/"
git pull cp "$SCRIPT_DIR"/.gitignore "$REPO_DIR/" 2>/dev/null || true
else
echo "[CLONE] Cloning repository..." # Ensure tools are executable
git clone "$REPO_URL" "$REPO_DIR" chmod +x "$REPO_DIR/deploy.sh" "$REPO_DIR/install.sh" 2>/dev/null || true
fi
echo "[DONE] Bootstrapping complete. Running first deploy..." echo "[DONE] Bootstrapping complete. Running first deploy..."
"$REPO_DIR/deploy.sh" --destroy "$REPO_DIR/deploy.sh" --destroy