From 509909de0991c06a74e427e2f0d9674cb22aa417 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 21 Apr 2026 10:14:03 +0100 Subject: [PATCH] chore: remove Forgejo references and fix setup URL - Remove all Forgejo branding from codebase for neutrality - Update setup.sh header comments and banner - Fix download URL in README from /raw/branch/main/ to /src/branch/main/ - Update changelog to document additional changes --- README.md | 12 ++++++------ changelog.md | 7 +++++-- setup.sh | 13 ++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7036e09..64d02e0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A comprehensive solution for deploying Wallarm filtering nodes on virtual machin ## Features - **Automated Preflight Checks** – Validates system readiness, network connectivity, and resource availability -- **Smart Artifact Management** – Git Repositorys/Forgejo-first approach with local fallback support +- **Smart Artifact Management** – Git Repositorys-first approach with local fallback support - **Multiple Node Support** – Deploy multiple Wallarm instances on the same VM with unique port configurations - **Interactive Configuration** – User-friendly prompts for cloud region, ports, token, and upstream applications - **Comprehensive Validation** – Network tests, port availability checks, and deployment verification @@ -35,7 +35,7 @@ A comprehensive solution for deploying Wallarm filtering nodes on virtual machin Use the wrapper script to download all necessary tools: ```bash -curl -fsSL "https://git.sechpoint.app/customer-engineering/wallarm/raw/branch/main/setup.sh" | bash +curl -fsSL "https://git.sechpoint.app/customer-engineering/wallarm/src/branch/main/setup.sh" | bash ``` This will download and make executable: @@ -170,7 +170,7 @@ sudo ./wallarm-ct-uninstall.sh The system uses a smart fallback approach for artifact retrieval: -### 1. **Primary Source**: Git Repositorys/Forgejo Repository +### 1. **Primary Source**: Git Repositorys - URL: `https://git.sechpoint.app/customer-engineering/wallarm` - Contains: Docker binaries and Wallarm images with SHA256 checksums - Benefits: Version control, access control, audit trail @@ -379,7 +379,7 @@ Ensure your upstream firewall/load balancer includes: ### Version Updates When updating Wallarm node version: -1. Pull new image from Git Repositorys/Forgejo or official registry +1. Pull new image from Git Repositorys or official registry 2. Stop existing container 3. Deploy new container with updated image 4. Verify functionality before removing old container @@ -406,13 +406,13 @@ This software is provided "AS IS", without warranty of any kind, express or impl ### Support - This is an unsupported deployment tool - No official support, maintenance, or updates are guaranteed -- Community contributions are welcome via the Forgejo repository +- Community contributions are welcome via the Git repository ## Contributing Contributions to improve the Wallarm deployment system are welcome: -1. Fork the repository on Forgejo +1. Fork the repository on Git 2. Create a feature branch 3. Make changes with comprehensive testing 4. Submit a merge request with description diff --git a/changelog.md b/changelog.md index 3e26701..a1b50e7 100644 --- a/changelog.md +++ b/changelog.md @@ -22,6 +22,8 @@ and this project adheres to date-based versioning (YYYY-MM.x). - **URL structure**: Updated `GIT_RAW_URL` from `/-/raw/main` to `/src/branch/main` path - **Terminology**: Replaced all "GitLab" references in comments and log messages with "Git Repositorys" - **Documentation**: Updated README.md to reflect new terminology +- **URL fix**: Updated setup.sh download URL in README.md from `/raw/branch/main/` to `/src/branch/main/` +- **Branding**: Removed all Forgejo references from codebase and documentation for neutrality - **Fallback chains**: Simplified from three-tier to two-tier approach - Docker binary: `Git Repositorys → local dir → current dir` (removed `→ internal proxy`) - Wallarm image: `Git Repositorys → local dir → current dir` (removed `→ internal registry`) @@ -37,8 +39,9 @@ and this project adheres to date-based versioning (YYYY-MM.x). ### Technical Details - **Commit**: `3158ee7` (chore: refactor git references and remove internal registry fallback) -- **Files modified**: 3 files changed, 73 insertions(+), 123 deletions(-) - - `README.md` - Documentation updates +- **Files modified**: 4 files changed, additional modifications + - `README.md` - Documentation updates and URL fixes + - `setup.sh` - URL base update and Forgejo reference removal - `wallarm-ct-check.sh` - Variable renaming and logic simplification - `wallarm-ct-deploy.sh` - Variable renaming and fallback chain updates diff --git a/setup.sh b/setup.sh index e8ae0d8..cc5fc4f 100644 --- a/setup.sh +++ b/setup.sh @@ -1,8 +1,8 @@ #!/bin/bash # ============================================================================== -# Wallarm Deployment Setup Script (Forgejo Version) +# Wallarm Deployment Setup Script # ============================================================================== -# Downloads all necessary Wallarm deployment scripts from the Forgejo repository +# Downloads all necessary Wallarm deployment scripts from the Git repository # and makes them executable. # ============================================================================== @@ -17,9 +17,8 @@ CYAN='\033[0;36m' BOLD='\033[1m' NC='\033[0m' -# Forgejo raw URL base -FORGEJO_BASE="https://git.sechpoint.app/customer-engineering/wallarm/raw/branch/main" - +# Git repository URL base +GIT_BASE="https://git.sechpoint.app/customer-engineering/wallarm/raw/branch/main/" SCRIPTS=( "wallarm-ct-check.sh" "wallarm-ct-deploy.sh" @@ -42,7 +41,7 @@ fi download_script() { local script="$1" - local url="${FORGEJO_BASE}/${script}" + local url="${GIT_BASE}/${script}" echo -e "${YELLOW}Downloading ${script}...${NC}" if [ -f "$script" ]; then echo -e "${YELLOW} File already exists. Overwrite? (y/N)${NC}" @@ -73,7 +72,7 @@ download_script() { clear echo -e "${BLUE}${BOLD}" echo "╔══════════════════════════════════════════════════════════════╗" -echo "║ WALLARM DEPLOYMENT SETUP SCRIPT (Forgejo) ║" +echo "║ WALLARM DEPLOYMENT SETUP SCRIPT ║" echo "║ Downloads all necessary deployment tools ║" echo "╚══════════════════════════════════════════════════════════════╝${NC}" echo