From 82f60bcf191ac2715e4a2a955b5647e1668d0efd Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Tue, 20 Jan 2026 11:35:53 -0800 Subject: [PATCH] Remove devpi from ansible - now hosted in k8s - Remove devpi and devpi_metrics roles from indri.yml - Remove svc:pypi from tailscale_serve config - Remove devpi logs from alloy collection - Remove devpi backup from borgmatic - Update README with correct uvx --from devpi-client syntax Co-Authored-By: Claude Opus 4.5 --- ansible/playbooks/indri.yml | 5 +---- ansible/roles/alloy/defaults/main.yml | 7 +------ ansible/roles/borgmatic/defaults/main.yml | 6 ++---- ansible/roles/tailscale_serve/defaults/main.yml | 7 +------ argocd/manifests/devpi/README.md | 8 ++++---- 5 files changed, 9 insertions(+), 24 deletions(-) diff --git a/ansible/playbooks/indri.yml b/ansible/playbooks/indri.yml index dac4f5f..e001da5 100644 --- a/ansible/playbooks/indri.yml +++ b/ansible/playbooks/indri.yml @@ -42,10 +42,7 @@ tags: borgmatic_metrics - role: forgejo tags: forgejo - - role: devpi - tags: devpi - - role: devpi_metrics - tags: devpi_metrics + # NOTE: devpi and devpi_metrics roles removed - now hosted in k8s (see argocd/apps/devpi.yaml) - role: zot tags: zot - role: zot_metrics diff --git a/ansible/roles/alloy/defaults/main.yml b/ansible/roles/alloy/defaults/main.yml index ccc2d8d..ec867f9 100644 --- a/ansible/roles/alloy/defaults/main.yml +++ b/ansible/roles/alloy/defaults/main.yml @@ -43,12 +43,7 @@ alloy_brew_logs: # NOTE: postgresql and miniflux removed - now hosted in k8s alloy_mcquack_logs: - - path: /Users/erichblume/Library/Logs/mcquack.devpi.out.log - service: devpi - stream: stdout - - path: /Users/erichblume/Library/Logs/mcquack.devpi.err.log - service: devpi - stream: stderr + # NOTE: devpi logs removed - now hosted in k8s - path: /Users/erichblume/Library/Logs/mcquack.kiwix-serve.out.log service: kiwix stream: stdout diff --git a/ansible/roles/borgmatic/defaults/main.yml b/ansible/roles/borgmatic/defaults/main.yml index e7807fd..49816d9 100644 --- a/ansible/roles/borgmatic/defaults/main.yml +++ b/ansible/roles/borgmatic/defaults/main.yml @@ -11,13 +11,13 @@ borgmatic_schedule_hour: 2 borgmatic_schedule_minute: 0 # Source directories to back up +# NOTE: devpi removed - now hosted in k8s (PVC handles persistence) borgmatic_source_directories: - /Users/erichblume/code/personal/zk - /opt/homebrew/var/forgejo - /Users/erichblume/.config/borgmatic - /Users/erichblume/Documents - /Users/erichblume/Pictures - - /Users/erichblume/devpi - /opt/homebrew/var/loki # Backup repository @@ -28,9 +28,7 @@ borgmatic_repositories: append_only: true # Exclude patterns -borgmatic_exclude_patterns: - # Exclude mirrored PyPI cache (only backup private packages) - - /Users/erichblume/devpi/+files/root/pypi +borgmatic_exclude_patterns: [] # Encryption passcommand (reads borg passphrase) borgmatic_encryption_passcommand: cat /Users/erichblume/.borg/config.yaml diff --git a/ansible/roles/tailscale_serve/defaults/main.yml b/ansible/roles/tailscale_serve/defaults/main.yml index b8cd4ac..a7b437f 100644 --- a/ansible/roles/tailscale_serve/defaults/main.yml +++ b/ansible/roles/tailscale_serve/defaults/main.yml @@ -3,7 +3,7 @@ # Each service maps a Tailscale service name to local endpoints tailscale_serve_services: - # NOTE: svc:grafana, svc:pg, svc:feed removed - now hosted in k8s + # NOTE: svc:grafana, svc:pg, svc:feed, svc:pypi removed - now hosted in k8s - name: svc:forge https: @@ -18,11 +18,6 @@ tailscale_serve_services: port: 443 upstream: http://localhost:5501 - - name: svc:pypi - https: - port: 443 - upstream: http://127.0.0.1:3141 - - name: svc:registry https: port: 443 diff --git a/argocd/manifests/devpi/README.md b/argocd/manifests/devpi/README.md index a349853..11fd697 100644 --- a/argocd/manifests/devpi/README.md +++ b/argocd/manifests/devpi/README.md @@ -28,15 +28,15 @@ After the pod is running: ```fish # Login to devpi as root -uvx devpi use https://pypi.tail8d86e.ts.net -uvx devpi login root +uvx --from devpi-client devpi use https://pypi.tail8d86e.ts.net +uvx --from devpi-client devpi login root # Enter root password when prompted # Create eblume user (prompts for password - use the one from 1Password) -uvx devpi user -c eblume email=blume.erich@gmail.com +uvx --from devpi-client devpi user -c eblume email=blume.erich@gmail.com # Create private index inheriting from PyPI -uvx devpi index -c eblume/dev bases=root/pypi +uvx --from devpi-client devpi index -c eblume/dev bases=root/pypi ``` ## Usage