From 0b5b340463f9867b555ab71c082b1a457d4e79a7 Mon Sep 17 00:00:00 2001 From: AIIrondev Date: Wed, 29 Apr 2026 10:36:49 +0200 Subject: [PATCH] Remove init-admin.sh references from documentation and update permissions in scripts Co-authored-by: Copilot --- .github/workflows/release-docker.yml | 5 ++--- README.md | 22 ++++++---------------- update.sh | 4 ++-- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index 493cc44..72720ad 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -230,8 +230,7 @@ jobs: cp backup.sh release-bundle/backup.sh cp config.json release-bundle/config.json cp update.sh release-bundle/update.sh - cp init-admin.sh release-bundle/init-admin.sh - + # Multitenant scripts & docs cp docker-compose-multitenant.yml release-bundle/docker-compose-multitenant.yml cp manage-tenant.sh release-bundle/manage-tenant.sh @@ -239,7 +238,7 @@ jobs: cp MULTITENANT_DEPLOYMENT.md release-bundle/MULTITENANT_DEPLOYMENT.md cp MULTITENANT_PYTHON_API.md release-bundle/MULTITENANT_PYTHON_API.md - chmod +x release-bundle/start.sh release-bundle/stop.sh release-bundle/restart.sh release-bundle/backup.sh release-bundle/update.sh release-bundle/init-admin.sh release-bundle/manage-tenant.sh release-bundle/run-tenant-cmd.sh + chmod +x release-bundle/start.sh release-bundle/stop.sh release-bundle/restart.sh release-bundle/backup.sh release-bundle/update.sh release-bundle/manage-tenant.sh release-bundle/run-tenant-cmd.sh tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle . - name: Create or update GitHub Release diff --git a/README.md b/README.md index 636e7b7..eecb303 100755 --- a/README.md +++ b/README.md @@ -45,8 +45,6 @@ Das Inventarsystem stellt folgende Wartungsskripte bereit: | `stop.sh` | Dienste stoppen | | `restart.sh` | Dienste neu starten | | `build-nuitka.sh` | Standalone-Build der App mit Nuitka erstellen | -| `init-admin.sh` | Initialisiert Admin-User wenn DB leer ist | -| `create-user.sh` | Erstellt neue User per Kommandozeile | | `Backup-DB.py` | Manuelles DB-Backup | | `restore.sh` | Backup wiederherstellen | | `manage-version.sh` | Versionssteuerung | @@ -286,27 +284,19 @@ https://[SERVER-IP] Wenn die Datenbank leer ist (beim ersten Start), erstellen Sie einen Admin-User: -**Option 1: Automatisiert beim Start** -```bash -./init-admin.sh -``` - -Mit benutzerdefinierten Daten: -```bash -./init-admin.sh myadmin mypassword123 Max Mustermann -``` - -**Option 2: Interaktiv** +**Option 1: Interaktiv** ```bash cd Web && python3 generate_user.py ``` -**Option 3: Per Kommandozeile** +**Option 2: Multitenant-Tenant erstellen** ```bash -./create-user.sh admin password123456 Admin User --admin +sudo ./manage-tenant.sh add ``` -**Option 4: Direkt in MongoDB (Notlösung)** +Dieser Weg erzeugt beim Anlegen eines neuen Tenants einen Standard-Admin für den Tenant. + +**Option 3: Direkt in MongoDB (Notlösung)** ```bash docker exec inventarsystem-mongodb mongosh --eval " db.users.insertOne({ diff --git a/update.sh b/update.sh index d53fbdb..0f21b6c 100755 --- a/update.sh +++ b/update.sh @@ -368,7 +368,7 @@ download_and_extract_bundle() { done # Ensure executable permissions on all copied scripts - chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh" "$PROJECT_DIR/init-admin.sh" "$PROJECT_DIR/manage-tenant.sh" "$PROJECT_DIR/run-tenant-cmd.sh" 2>/dev/null || true 2>/dev/null || true + chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh" "$PROJECT_DIR/manage-tenant.sh" "$PROJECT_DIR/run-tenant-cmd.sh" 2>/dev/null || true 2>/dev/null || true chmod +x "$PROJECT_DIR"/manage-tenant.sh "$PROJECT_DIR"/run-tenant-cmd.sh 2>/dev/null || true if [ ! -f "$PROJECT_DIR/config.json" ] && [ -f "$tmp_dir/config.json" ]; then @@ -376,7 +376,7 @@ download_and_extract_bundle() { log_message "Installed default config.json from release bundle" fi - chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh" "$PROJECT_DIR/init-admin.sh" "$PROJECT_DIR/manage-tenant.sh" "$PROJECT_DIR/run-tenant-cmd.sh" 2>/dev/null || true + chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh" "$PROJECT_DIR/manage-tenant.sh" "$PROJECT_DIR/run-tenant-cmd.sh" 2>/dev/null || true } deploy() {