diff --git a/.forgejo/workflows/build-blumeops.yaml b/.forgejo/workflows/build-blumeops.yaml index 616d2cf..e6fe92d 100644 --- a/.forgejo/workflows/build-blumeops.yaml +++ b/.forgejo/workflows/build-blumeops.yaml @@ -11,7 +11,7 @@ # 3. The workflow creates a release with attached artifacts # # Documentation asset URL: -# https://forge.ops.eblu.me/eblume/blumeops/releases/download//docs-.tar.gz +# https://forge.eblu.me/eblume/blumeops/releases/download//docs-.tar.gz name: Build BlumeOps @@ -46,7 +46,7 @@ jobs: # Fetch latest release echo "Fetching latest release..." - LATEST=$(curl -s "https://forge.ops.eblu.me/api/v1/repos/eblume/blumeops/releases/latest" | jq -r '.tag_name // empty' || true) + LATEST=$(curl -s "https://forge.eblu.me/api/v1/repos/eblume/blumeops/releases/latest" | jq -r '.tag_name // empty' || true) if [ -z "$LATEST" ]; then LATEST="v0.0.0" @@ -94,9 +94,9 @@ jobs: esac # Check if this version already exists - if curl -sf "https://forge.ops.eblu.me/api/v1/repos/eblume/blumeops/releases/tags/$VERSION" > /dev/null 2>&1; then + if curl -sf "https://forge.eblu.me/api/v1/repos/eblume/blumeops/releases/tags/$VERSION" > /dev/null 2>&1; then echo "Error: Release $VERSION already exists" - echo "See: https://forge.ops.eblu.me/eblume/blumeops/releases/tag/$VERSION" + echo "See: https://forge.eblu.me/eblume/blumeops/releases/tag/$VERSION" exit 1 fi @@ -181,7 +181,7 @@ jobs: echo "Download \`$TARBALL\` and configure the quartz container with:" echo "" echo "\`\`\`" - echo "DOCS_RELEASE_URL=https://forge.ops.eblu.me/eblume/blumeops/releases/download/$VERSION/$TARBALL" + echo "DOCS_RELEASE_URL=https://forge.eblu.me/eblume/blumeops/releases/download/$VERSION/$TARBALL" echo "\`\`\`" } > /tmp/release_body.txt @@ -197,7 +197,7 @@ jobs: -H "Content-Type: application/json" \ -H "Authorization: token $GITHUB_TOKEN" \ -d "$RELEASE_DATA" \ - "https://forge.ops.eblu.me/api/v1/repos/eblume/blumeops/releases") + "https://forge.eblu.me/api/v1/repos/eblume/blumeops/releases") echo "API Response: $RELEASE_RESPONSE" @@ -217,7 +217,7 @@ jobs: -H "Content-Type: application/gzip" \ -H "Authorization: token $GITHUB_TOKEN" \ --data-binary "@$TARBALL" \ - "https://forge.ops.eblu.me/api/v1/repos/eblume/blumeops/releases/$RELEASE_ID/assets?name=$TARBALL") + "https://forge.eblu.me/api/v1/repos/eblume/blumeops/releases/$RELEASE_ID/assets?name=$TARBALL") echo "Upload Response: $UPLOAD_RESPONSE" echo "" @@ -228,7 +228,7 @@ jobs: VERSION="${{ steps.version.outputs.version }}" TARBALL="docs-${VERSION}.tar.gz" DEPLOYMENT_FILE="argocd/manifests/docs/deployment.yaml" - RELEASE_URL="https://forge.ops.eblu.me/eblume/blumeops/releases/download/${VERSION}/${TARBALL}" + RELEASE_URL="https://forge.eblu.me/eblume/blumeops/releases/download/${VERSION}/${TARBALL}" echo "Updating $DEPLOYMENT_FILE with new release URL..." yq -i "(.spec.template.spec.containers[0].env[] | select(.name == \"DOCS_RELEASE_URL\")).value = \"${RELEASE_URL}\"" "$DEPLOYMENT_FILE" @@ -307,7 +307,7 @@ jobs: echo "================================================" echo "" echo "Release URL:" - echo " https://forge.ops.eblu.me/eblume/blumeops/releases/tag/$VERSION" + echo " https://forge.eblu.me/eblume/blumeops/releases/tag/$VERSION" echo "" echo "Asset URL (for DOCS_RELEASE_URL ConfigMap):" - echo " https://forge.ops.eblu.me/eblume/blumeops/releases/download/$VERSION/$TARBALL" + echo " https://forge.eblu.me/eblume/blumeops/releases/download/$VERSION/$TARBALL" diff --git a/.forgejo/workflows/cv-deploy.yaml b/.forgejo/workflows/cv-deploy.yaml index 983154b..b03b925 100644 --- a/.forgejo/workflows/cv-deploy.yaml +++ b/.forgejo/workflows/cv-deploy.yaml @@ -30,7 +30,7 @@ jobs: if [ "$INPUT_VERSION" = "latest" ]; then echo "Resolving latest CV package version..." - VERSION=$(curl -s "https://forge.ops.eblu.me/api/v1/packages/eblume?type=generic&q=cv" \ + VERSION=$(curl -s "https://forge.eblu.me/api/v1/packages/eblume?type=generic&q=cv" \ | jq -r '[.[] | select(.name == "cv")] | sort_by(.version) | last | .version // empty') if [ -z "$VERSION" ]; then @@ -48,7 +48,7 @@ jobs: # Verify the package exists TARBALL="cv-${VERSION}.tar.gz" - PACKAGE_URL="https://forge.ops.eblu.me/api/packages/eblume/generic/cv/${VERSION}/${TARBALL}" + PACKAGE_URL="https://forge.eblu.me/api/packages/eblume/generic/cv/${VERSION}/${TARBALL}" if ! curl -fsSL --head "$PACKAGE_URL" > /dev/null 2>&1; then echo "Error: Package not found at $PACKAGE_URL" echo "Run the 'Release CV' workflow in the cv repo first." @@ -65,7 +65,7 @@ jobs: VERSION="${{ steps.version.outputs.version }}" TARBALL="cv-${VERSION}.tar.gz" DEPLOYMENT_FILE="argocd/manifests/cv/deployment.yaml" - RELEASE_URL="https://forge.ops.eblu.me/api/packages/eblume/generic/cv/${VERSION}/${TARBALL}" + RELEASE_URL="https://forge.eblu.me/api/packages/eblume/generic/cv/${VERSION}/${TARBALL}" echo "Updating $DEPLOYMENT_FILE with CV_RELEASE_URL..." yq -i "(.spec.template.spec.containers[0].env[] | select(.name == \"CV_RELEASE_URL\")).value = \"${RELEASE_URL}\"" "$DEPLOYMENT_FILE" diff --git a/ansible/playbooks/ringtail.yml b/ansible/playbooks/ringtail.yml index b05d67a..ee5604b 100644 --- a/ansible/playbooks/ringtail.yml +++ b/ansible/playbooks/ringtail.yml @@ -57,7 +57,7 @@ tasks: - name: Ensure blumeops repo is present ansible.builtin.git: - repo: "https://forge.ops.eblu.me/eblume/blumeops.git" + repo: "https://forge.eblu.me/eblume/blumeops.git" dest: /etc/blumeops version: "{{ ringtail_commit | default('main') }}" force: true diff --git a/ansible/roles/forgejo_actions_secrets/defaults/main.yml b/ansible/roles/forgejo_actions_secrets/defaults/main.yml index 943b8af..7742ecf 100644 --- a/ansible/roles/forgejo_actions_secrets/defaults/main.yml +++ b/ansible/roles/forgejo_actions_secrets/defaults/main.yml @@ -4,7 +4,7 @@ # This role syncs repository-level Actions secrets from 1Password to Forgejo # via the Forgejo API. -forgejo_actions_secrets_api_url: "https://forge.ops.eblu.me/api/v1" +forgejo_actions_secrets_api_url: "https://forge.eblu.me/api/v1" forgejo_actions_secrets_owner: eblume # Secrets to sync per repo. diff --git a/argocd/apps/forgejo-runner.yaml b/argocd/apps/forgejo-runner.yaml index 5bca762..7addb40 100644 --- a/argocd/apps/forgejo-runner.yaml +++ b/argocd/apps/forgejo-runner.yaml @@ -6,7 +6,7 @@ metadata: spec: project: default source: - repoURL: https://forge.ops.eblu.me/eblume/blumeops.git + repoURL: https://forge.eblu.me/eblume/blumeops.git targetRevision: main path: argocd/manifests/forgejo-runner destination: diff --git a/argocd/manifests/cv/deployment.yaml b/argocd/manifests/cv/deployment.yaml index ba969fc..2e929b4 100644 --- a/argocd/manifests/cv/deployment.yaml +++ b/argocd/manifests/cv/deployment.yaml @@ -27,7 +27,7 @@ spec: name: http env: - name: CV_RELEASE_URL - value: "https://forge.ops.eblu.me/api/packages/eblume/generic/cv/v1.0.3/cv-v1.0.3.tar.gz" + value: "https://forge.eblu.me/api/packages/eblume/generic/cv/v1.0.3/cv-v1.0.3.tar.gz" resources: requests: memory: "64Mi" diff --git a/argocd/manifests/docs/deployment.yaml b/argocd/manifests/docs/deployment.yaml index 66506c4..af8b655 100644 --- a/argocd/manifests/docs/deployment.yaml +++ b/argocd/manifests/docs/deployment.yaml @@ -27,7 +27,7 @@ spec: name: http env: - name: DOCS_RELEASE_URL - value: "https://forge.ops.eblu.me/eblume/blumeops/releases/download/v1.12.1/docs-v1.12.1.tar.gz" + value: "https://forge.eblu.me/eblume/blumeops/releases/download/v1.12.1/docs-v1.12.1.tar.gz" resources: requests: memory: "64Mi" diff --git a/argocd/manifests/forgejo-runner/deployment.yaml b/argocd/manifests/forgejo-runner/deployment.yaml index 4f67672..6e57137 100644 --- a/argocd/manifests/forgejo-runner/deployment.yaml +++ b/argocd/manifests/forgejo-runner/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: DOCKER_HOST value: tcp://localhost:2375 - name: FORGEJO_URL - value: "https://forge.ops.eblu.me" + value: "https://forge.eblu.me" - name: RUNNER_NAME value: "k8s-runner" - name: RUNNER_LABELS diff --git a/argocd/manifests/homepage/services.yaml b/argocd/manifests/homepage/services.yaml index 0f35e9c..fcde74f 100644 --- a/argocd/manifests/homepage/services.yaml +++ b/argocd/manifests/homepage/services.yaml @@ -1,11 +1,11 @@ - Host Services: - Forgejo: - href: https://forge.ops.eblu.me + href: https://forge.eblu.me icon: forgejo description: Git forge widget: type: gitea - url: https://forge.ops.eblu.me + url: https://forge.eblu.me key: "{{HOMEPAGE_VAR_FORGEJO_API_KEY}}" - Registry: href: https://registry.ops.eblu.me diff --git a/docs/how-to/authentik/build-authentik-from-source.md b/docs/how-to/authentik/build-authentik-from-source.md index 169a0ed..d4411e3 100644 --- a/docs/how-to/authentik/build-authentik-from-source.md +++ b/docs/how-to/authentik/build-authentik-from-source.md @@ -36,8 +36,8 @@ The `ak` wrapper script in `default.nix` sets PATH/VIRTUAL_ENV and delegates to ## Source All derivations fetch from forge mirrors for supply chain control: -- https://forge.ops.eblu.me/mirrors/authentik (upstream: `goauthentik/authentik`) -- https://forge.ops.eblu.me/mirrors/authentik-client-go (upstream: `goauthentik/client-go`) +- https://forge.eblu.me/mirrors/authentik (upstream: `goauthentik/authentik`) +- https://forge.eblu.me/mirrors/authentik-client-go (upstream: `goauthentik/client-go`) Version and hashes are centralized in `containers/authentik/sources.nix`. diff --git a/docs/how-to/configuration/update-documentation.md b/docs/how-to/configuration/update-documentation.md index fef8ccf..7c98e24 100644 --- a/docs/how-to/configuration/update-documentation.md +++ b/docs/how-to/configuration/update-documentation.md @@ -20,7 +20,7 @@ After merging documentation changes to main: 2. Select version bump type (patch/minor/major) or enter a specific version 3. The workflow builds, releases, and deploys automatically -Direct link: https://forge.ops.eblu.me/eblume/blumeops/actions?workflow=build-blumeops.yaml +Direct link: https://forge.eblu.me/eblume/blumeops/actions?workflow=build-blumeops.yaml ## What the Workflow Does diff --git a/docs/how-to/deployment/build-container-image.md b/docs/how-to/deployment/build-container-image.md index 9f6d7b8..b3b9cbe 100644 --- a/docs/how-to/deployment/build-container-image.md +++ b/docs/how-to/deployment/build-container-image.md @@ -93,7 +93,7 @@ Container image tags include the git commit SHA they were built from (e.g. `v3.9 **The rule:** Production manifests must reference images built from a commit on main. After merging a PR that changed `containers//`: 1. The merge to main automatically triggers a rebuild (the `build-container.yaml` / `build-container-nix.yaml` workflows fire on pushes to `main` that touch `containers/**`) -2. Wait for the workflow to complete — check at `https://forge.ops.eblu.me/eblume/blumeops/actions` +2. Wait for the workflow to complete — check at `https://forge.eblu.me/eblume/blumeops/actions` 3. Find the new main-SHA tag: ```bash mise run container-list diff --git a/docs/how-to/deployment/create-release-artifact-workflow.md b/docs/how-to/deployment/create-release-artifact-workflow.md index 80e0308..63c217e 100644 --- a/docs/how-to/deployment/create-release-artifact-workflow.md +++ b/docs/how-to/deployment/create-release-artifact-workflow.md @@ -48,16 +48,16 @@ The upload step uses `FORGE_TOKEN`: -X PUT \ -H "Authorization: token $FORGE_TOKEN" \ --upload-file "./$TARBALL" \ - "https://forge.ops.eblu.me/api/packages/eblume/generic//${VERSION}/${TARBALL}" + "https://forge.eblu.me/api/packages/eblume/generic//${VERSION}/${TARBALL}" ``` ## 3. Link the package to the repo -After the first successful upload, the package appears under your **user-level** packages at `https://forge.ops.eblu.me/eblume/-/packages` but is not yet linked to the repo. +After the first successful upload, the package appears under your **user-level** packages at `https://forge.eblu.me/eblume/-/packages` but is not yet linked to the repo. To link it: -1. Go to `https://forge.ops.eblu.me/eblume/-/packages` +1. Go to `https://forge.eblu.me/eblume/-/packages` 2. Click the package name 3. Click **Settings** 4. Under **Link this package to a repository**, select the repo diff --git a/docs/how-to/plans/completed/adopt-dagger-ci.md b/docs/how-to/plans/completed/adopt-dagger-ci.md index a3ec8ce..aabae1d 100644 --- a/docs/how-to/plans/completed/adopt-dagger-ci.md +++ b/docs/how-to/plans/completed/adopt-dagger-ci.md @@ -222,12 +222,12 @@ Migrate `build-blumeops.yaml` to use Dagger for the build logic and switch from **Current:** Docs tarball uploaded as a Forgejo release asset. ``` -https://forge.ops.eblu.me/eblume/blumeops/releases/download/v1.5.2/docs-v1.5.2.tar.gz +https://forge.eblu.me/eblume/blumeops/releases/download/v1.5.2/docs-v1.5.2.tar.gz ``` **New:** Docs tarball uploaded to Forgejo generic packages registry. ``` -https://forge.ops.eblu.me/api/packages/eblume/generic/blumeops-docs/v1.6.0/docs-v1.6.0.tar.gz +https://forge.eblu.me/api/packages/eblume/generic/blumeops-docs/v1.6.0/docs-v1.6.0.tar.gz ``` This decouples the docs artifact from git releases while keeping the versioned URL pattern. Forgejo releases can still be created for changelog/announcement purposes without carrying the tarball. @@ -290,13 +290,13 @@ async def upload_docs( async with httpx.AsyncClient() as client: with open(f"/tmp/docs-{version}.tar.gz", "rb") as f: resp = await client.put( - f"https://forge.ops.eblu.me/api/packages/eblume/generic/" + f"https://forge.eblu.me/api/packages/eblume/generic/" f"blumeops-docs/{version}/docs-{version}.tar.gz", headers={"Authorization": f"token {token}"}, content=f.read(), ) resp.raise_for_status() - return f"https://forge.ops.eblu.me/api/packages/eblume/generic/blumeops-docs/{version}/docs-{version}.tar.gz" + return f"https://forge.eblu.me/api/packages/eblume/generic/blumeops-docs/{version}/docs-{version}.tar.gz" @function async def release_docs( @@ -388,7 +388,7 @@ jobs: - name: Update manifest and commit run: | VERSION="${{ steps.version.outputs.version }}" - URL="https://forge.ops.eblu.me/api/packages/eblume/generic/blumeops-docs/${VERSION}/docs-${VERSION}.tar.gz" + URL="https://forge.eblu.me/api/packages/eblume/generic/blumeops-docs/${VERSION}/docs-${VERSION}.tar.gz" sed -i "s|value: \"https://.*\"|value: \"${URL}\"|" \ argocd/manifests/docs/deployment.yaml git config user.name "Forgejo Actions" @@ -405,11 +405,11 @@ The quartz container's `DOCS_RELEASE_URL` env var in `argocd/manifests/docs/depl ```yaml # Before (Forgejo releases): - name: DOCS_RELEASE_URL - value: "https://forge.ops.eblu.me/eblume/blumeops/releases/download/v1.5.2/docs-v1.5.2.tar.gz" + value: "https://forge.eblu.me/eblume/blumeops/releases/download/v1.5.2/docs-v1.5.2.tar.gz" # After (Forgejo generic packages): - name: DOCS_RELEASE_URL - value: "https://forge.ops.eblu.me/api/packages/eblume/generic/blumeops-docs/v1.6.0/docs-v1.6.0.tar.gz" + value: "https://forge.eblu.me/api/packages/eblume/generic/blumeops-docs/v1.6.0/docs-v1.6.0.tar.gz" ``` The quartz container's `start.sh` already downloads from `DOCS_RELEASE_URL` via curl — no container changes needed, just the URL format changes. diff --git a/docs/how-to/plans/migrate-forgejo-from-brew.md b/docs/how-to/plans/migrate-forgejo-from-brew.md index 3a77154..4daad6b 100644 --- a/docs/how-to/plans/migrate-forgejo-from-brew.md +++ b/docs/how-to/plans/migrate-forgejo-from-brew.md @@ -32,7 +32,7 @@ https://codeberg.org/forgejo/forgejo.git Add the forge mirror as a secondary remote for convenience and backup: ``` -https://forge.ops.eblu.me/mirrors/forgejo.git +https://forge.eblu.me/mirrors/forgejo.git ``` ## One-Time Migration Steps @@ -48,7 +48,7 @@ ssh indri 'git clone https://codeberg.org/forgejo/forgejo.git ~/code/3rd/forgejo ### 2. Add Forge Mirror as Secondary Remote ```fish -ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.ops.eblu.me/mirrors/forgejo.git' +ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.eblu.me/mirrors/forgejo.git' ``` ### 3. Check Out the Desired Version Tag @@ -155,7 +155,7 @@ Replace brew install/start with binary-check + LaunchAgent pattern (matching `an # ssh indri 'git clone https://codeberg.org/forgejo/forgejo.git ~/code/3rd/forgejo' # # 2. Add forge mirror as secondary remote: -# ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.ops.eblu.me/mirrors/forgejo.git' +# ssh indri 'cd ~/code/3rd/forgejo && git remote add forge https://forge.eblu.me/mirrors/forgejo.git' # # 3. Set up Go and Node via mise: # ssh indri 'cd ~/code/3rd/forgejo && mise use go@1.24 node@20' @@ -275,7 +275,7 @@ No changes needed — paths already flow through variables in `defaults/main.yml After running the migration and Ansible: - [ ] `ssh indri 'launchctl list mcquack.eblume.forgejo'` — shows running -- [ ] `curl https://forge.ops.eblu.me/api/v1/version` — returns JSON with version +- [ ] `curl https://forge.eblu.me/api/v1/version` — returns JSON with version - [ ] Git clone over SSH: `git clone ssh://forgejo@forge.ops.eblu.me:2222/eblume/blumeops.git /tmp/test-clone` - [ ] Git push works on an existing clone - [ ] Ansible dry-run is clean: `mise run provision-indri -- --tags forgejo --check --diff` diff --git a/docs/how-to/plans/upstream-fork-strategy.md b/docs/how-to/plans/upstream-fork-strategy.md index b2ce412..e2af8c8 100644 --- a/docs/how-to/plans/upstream-fork-strategy.md +++ b/docs/how-to/plans/upstream-fork-strategy.md @@ -209,7 +209,7 @@ This fork directly supports the [[adopt-dagger-ci]] plan. Once the fork exists, # After (using the BlumeOps fork): .with_exec(["git", "clone", "--depth=1", "--branch=blumeops", - "https://forge.ops.eblu.me/mirrors/quartz.git", "/tmp/quartz"]) + "https://forge.eblu.me/mirrors/quartz.git", "/tmp/quartz"]) ``` This means the `build-blumeops.yaml` workflow automatically picks up fork customizations (like `last-reviewed` rendering) when building docs — no separate integration step needed. Local iteration via `dagger call build-docs` also uses the fork, so you can test Quartz customizations against actual BlumeOps content before pushing. diff --git a/docs/how-to/zot/register-zot-oidc-client.md b/docs/how-to/zot/register-zot-oidc-client.md index ff7d805..b3696d0 100644 --- a/docs/how-to/zot/register-zot-oidc-client.md +++ b/docs/how-to/zot/register-zot-oidc-client.md @@ -12,7 +12,7 @@ tags: Register a zot OAuth2 provider and application in Authentik via blueprint, following the same pattern as Grafana and Forgejo. -Completed in PR [#236](https://forge.ops.eblu.me/eblume/blumeops/pulls/236). +Completed in PR [#236](https://forge.eblu.me/eblume/blumeops/pulls/236). ## What Was Done diff --git a/docs/index.md b/docs/index.md index 6d7822d..306e73c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -16,7 +16,7 @@ infrastructure. BlumeOps is my personal homelab infrastructure managed entirely through code. Everything lives in a [single git repository](https://github.com/eblume/blumeops), from service configs to -deployment automation. Even the [[forgejo]] instance that [hosts this repo](https://forge.ops.eblu.me/eblume/blumeops) +deployment automation. Even the [[forgejo]] instance that [hosts this repo](https://forge.eblu.me/eblume/blumeops) is defined within it, making BlumeOps fully self-hosting. It's a digital life raft I built for myself as I went, and you can see it all from within your editor of choice. (I recommend vim.) diff --git a/docs/quartz.layout.ts b/docs/quartz.layout.ts index c3f7e6d..cba29ec 100644 --- a/docs/quartz.layout.ts +++ b/docs/quartz.layout.ts @@ -14,7 +14,7 @@ export const sharedPageComponents: SharedLayout = { footer: Component.Footer({ links: { "GitHub": "https://github.com/eblume/blumeops", - "Forge": "https://forge.ops.eblu.me/eblume/blumeops", + "Forge": "https://forge.eblu.me/eblume/blumeops", }, }), } diff --git a/docs/reference/services/forgejo.md b/docs/reference/services/forgejo.md index 504107e..1f56029 100644 --- a/docs/reference/services/forgejo.md +++ b/docs/reference/services/forgejo.md @@ -72,7 +72,7 @@ mise run provision-indri -- --tags forgejo_actions_secrets The Ansible role authenticates to the Forgejo API using a Personal Access Token (PAT). This PAT must be created manually: -1. Go to https://forge.ops.eblu.me/user/settings/applications +1. Go to https://forge.eblu.me/user/settings/applications 2. Create a new token with `write:repository` scope 3. Store it in 1Password → "Forgejo Secrets" item → `api-token` field diff --git a/docs/tutorials/contributing.md b/docs/tutorials/contributing.md index 61d32e8..cddafea 100644 --- a/docs/tutorials/contributing.md +++ b/docs/tutorials/contributing.md @@ -16,7 +16,7 @@ This tutorial walks through making your first contribution to BluemeOps - from u Before contributing, you'll need: - Access to the [[tailscale|Tailscale]] network (request from Erich) -- SSH key added to [[forgejo|Forgejo]] (https://forge.ops.eblu.me) +- SSH key added to [[forgejo|Forgejo]] (https://forge.eblu.me) - Development tools installed (see below) ## Tooling Setup diff --git a/mise-tasks/branch-cleanup b/mise-tasks/branch-cleanup index 85be4e6..88e9152 100755 --- a/mise-tasks/branch-cleanup +++ b/mise-tasks/branch-cleanup @@ -44,7 +44,7 @@ from rich.console import Console from rich.table import Table PROTECTED_BRANCHES = {"main", "master"} -FORGE_API = "https://forge.ops.eblu.me/api/v1" +FORGE_API = "https://forge.eblu.me/api/v1" REPO_OWNER = "eblume" REPO_NAME = "blumeops" OP_TOKEN_REF = "op://vg6xf6vvfmoh5hqjjhlhbeoaie/w3663ffnvkewbftncqxtcpeavy/api-token" diff --git a/mise-tasks/container-build-and-release b/mise-tasks/container-build-and-release index 2226550..dd78923 100755 --- a/mise-tasks/container-build-and-release +++ b/mise-tasks/container-build-and-release @@ -21,7 +21,7 @@ import httpx import typer REGISTRY = "registry.ops.eblu.me" -FORGE_URL = "https://forge.ops.eblu.me" +FORGE_URL = "https://forge.eblu.me" FORGE_API = f"{FORGE_URL}/api/v1" REPO = "eblume/blumeops" FORGE_ACTIONS = f"{FORGE_URL}/{REPO}/actions" diff --git a/mise-tasks/docs-mikado b/mise-tasks/docs-mikado index e28c3f1..17a363d 100755 --- a/mise-tasks/docs-mikado +++ b/mise-tasks/docs-mikado @@ -238,7 +238,7 @@ def classify_branch_position(commits: list[dict]) -> str: return "unknown" -FORGE_API = "https://forge.ops.eblu.me/api/v1" +FORGE_API = "https://forge.eblu.me/api/v1" def find_pr_for_branch(branch: str) -> dict | None: diff --git a/mise-tasks/mirror-create b/mise-tasks/mirror-create index 75e0d3e..b0e82a0 100755 --- a/mise-tasks/mirror-create +++ b/mise-tasks/mirror-create @@ -6,7 +6,7 @@ #USAGE flag "--dry-run" help="Show what would be done without creating" set -euo pipefail -FORGE_API="https://forge.ops.eblu.me/api/v1" +FORGE_API="https://forge.eblu.me/api/v1" ORG="mirrors" OP_TOKEN_REF="op://blumeops/w3663ffnvkewbftncqxtcpeavy/api-token" OP_GITHUB_PAT_REF="op://blumeops/w3663ffnvkewbftncqxtcpeavy/github-mirror-pat" @@ -72,7 +72,7 @@ http_code=$(curl -s -o /tmp/mirror-create-response.json -w "%{http_code}" \ -d "$payload") if [[ "$http_code" == "201" ]]; then - echo "Created mirror: https://forge.ops.eblu.me/${ORG}/${repo_name}" + echo "Created mirror: https://forge.eblu.me/${ORG}/${repo_name}" else echo "Error (HTTP $http_code):" cat /tmp/mirror-create-response.json diff --git a/mise-tasks/pr-comments b/mise-tasks/pr-comments index 0f6b840..9c33f9d 100755 --- a/mise-tasks/pr-comments +++ b/mise-tasks/pr-comments @@ -20,7 +20,7 @@ import httpx from rich.console import Console from rich.text import Text -FORGE_API_BASE = "https://forge.ops.eblu.me/api/v1" +FORGE_API_BASE = "https://forge.eblu.me/api/v1" REPO_OWNER = "eblume" REPO_NAME = "blumeops" diff --git a/mise-tasks/runner-logs b/mise-tasks/runner-logs index 536f1fe..22e4640 100755 --- a/mise-tasks/runner-logs +++ b/mise-tasks/runner-logs @@ -27,7 +27,7 @@ import typer from rich.console import Console from rich.table import Table -FORGE_API = "https://forge.ops.eblu.me/api/v1" +FORGE_API = "https://forge.eblu.me/api/v1" REPO = "eblume/blumeops" ACTIONS_LOG_DIR = "/opt/homebrew/var/forgejo/data/actions_log/eblume/blumeops" diff --git a/mise-tasks/services-check b/mise-tasks/services-check index d09b237..dce18ee 100755 --- a/mise-tasks/services-check +++ b/mise-tasks/services-check @@ -70,7 +70,7 @@ check_http "Prometheus" "https://prometheus.ops.eblu.me/-/healthy" check_http "Loki" "https://loki.ops.eblu.me/ready" check_http "Grafana" "https://grafana.ops.eblu.me/api/health" check_http "ArgoCD" "https://argocd.ops.eblu.me/healthz" -check_http "Forgejo" "https://forge.ops.eblu.me/" +check_http "Forgejo" "https://forge.eblu.me/" check_http "Zot Registry" "https://registry.ops.eblu.me/v2/_catalog" check_http "Kiwix" "https://kiwix.ops.eblu.me/" check_http "Miniflux" "https://feed.ops.eblu.me/healthcheck" diff --git a/nixos/ringtail/configuration.nix b/nixos/ringtail/configuration.nix index 5a0035b..562cfdb 100644 --- a/nixos/ringtail/configuration.nix +++ b/nixos/ringtail/configuration.nix @@ -496,7 +496,7 @@ in instances.nix_container_builder = { enable = true; name = "ringtail-nix-builder"; - url = "https://forge.ops.eblu.me"; + url = "https://forge.eblu.me"; tokenFile = "/etc/forgejo-runner/token.env"; labels = [ "nix-container-builder:host" ]; hostPackages = with pkgs; [