Switch to Incarnator

Closes #479

5 files changed, 10 insertions, 7 deletions

diff --git a/INTERESTING_PROJECTS.org b/INTERESTING_PROJECTS.org
index 50b9f0d8..380b91a9 100644
--- a/INTERESTING_PROJECTS.org
+++ b/INTERESTING_PROJECTS.org
@@ -254,8 +254,8 @@ Also keeping things in a Org mode means I can classify and add notes.
 *** Fediverse
     - https://github.com/bashrc2/epicyon
     - https://microblog.pub/
-    - https://jointakahe.org/
-    - https://github.com/enafore/enafore - Keyboard-friendly Mastodon web client, compatible with Takahe
+    - https://jointakahe.org/ (active fork https://github.com/avaraline/incarnator)
+    - https://github.com/enafore/enafore - Keyboard-friendly Mastodon web client, compatible with Takahe/Incarnator
     - https://github.com/ihabunek/toot - Terminal Mastodon web client.
 ** Pubnix
    - https://github.com/cwmccabe/pubnixhist
diff --git a/blog/content/2024/03/bienvenidos-al-fediverso.gmi b/blog/content/2024/03/bienvenidos-al-fediverso.gmi
index abf2c73f..2af02c84 100644
--- a/blog/content/2024/03/bienvenidos-al-fediverso.gmi
+++ b/blog/content/2024/03/bienvenidos-al-fediverso.gmi
@@ -9,10 +9,13 @@ Pensaba que el cacareado "Mastodon is hard" era una exageración de apoltronados
 
 En los detalles técnicos, estoy usando Takahe[1] sobre mi Kubernetes. Como intento publicar todo el montaje de mi infraestructura, podéis curiosear por aquí[2]. Aparte de lo primitivo del despliegue, lo otro destacable es que como Takahe quiere "object storage", estoy de pruebas con SeaweedFS[3] y he comenzado a mantener un RPM para desplegarlo[4].
 
+Actualización 2025-06-14: Estoy usando Incarnator[5], porque Takahe está un poco inactivo e Incarnator es un fork más activo.
+
 => https://jointakahe.org/ [1] Takahe
 => https://github.com/alexpdp7/alexpdp7/blob/master/personal_infra/playbooks/roles/takahe/tasks/main.yaml [2] El playbook que despliega Takahe
 => https://github.com/seaweedfs/seaweedfs [3] SeaweedFS
 => https://github.com/alexpdp7/seaweedfs-rpm/tree/main [4] Un RPM de SeaweedFS
+=> https://github.com/avaraline/incarnator [5] Incarnator, un fork más activo de Takahe
 
 Las ventajas de Takahe son:
 
diff --git a/misc/setup.md b/misc/setup.md
index 21aab1b2..6f66a3d5 100644
--- a/misc/setup.md
+++ b/misc/setup.md
@@ -35,7 +35,7 @@ I use Firefox with LanguageTool, Bitwarden and NoScript.
 ## Services
 
 * Miniflux (RSS) (self-hosted)
-* Takahe (ActivityPub/Fediverse/Mastodon), with Enafore for desktop, Toot for terminal, and Tusky for Android (self-hosted)
+* Incarnator (ActivityPub/Fediverse/Mastodon), with Enafore for desktop, Toot for terminal, and Tusky for Android (self-hosted)
 * Telegram, WhatsApp, Discord, Signal, Slack, Google Messages, but also [modern IRC](../workstation/modern_irc.md)
 * TVMaze
 * Google (GMail, Calendar, Contacts)
diff --git a/personal_infra/README.md b/personal_infra/README.md
index 2a2c2892..f2c50239 100644
--- a/personal_infra/README.md
+++ b/personal_infra/README.md
@@ -19,7 +19,7 @@ See [HACKING](HACKING.md) for more "usage" instructions.
   * LXC container running SeaweedFS (for Takahe)
   * Two VMs running Talos, providing two Kubernetes clusters (production/test)
     * My blog
-    * Takahe
+    * Incarnator
     * A CRUD system I run to track my weight
     * Some other small projects
 * Flat 1
diff --git a/personal_infra/playbooks/roles/takahe/tasks/main.yaml b/personal_infra/playbooks/roles/takahe/tasks/main.yaml
index 45ca2eae..a169dd84 100644
--- a/personal_infra/playbooks/roles/takahe/tasks/main.yaml
+++ b/personal_infra/playbooks/roles/takahe/tasks/main.yaml
@@ -89,7 +89,7 @@
           spec:
             containers:
               - name: webserver
-                image: "jointakahe/takahe:{{ takahe.version }}"
+                image: "docker.io/avaraline/incarnator:{{ takahe.version }}"
                 args:
                   - "gunicorn"
                   - "takahe.wsgi:application"
@@ -188,7 +188,7 @@
           spec:
             containers:
               - name: stator
-                image: "jointakahe/takahe:{{ takahe.version }}"
+                image: "docker.io/avaraline/incarnator:{{ takahe.version }}"
                 args:
                   - python3
                   - manage.py
@@ -214,7 +214,7 @@
             restartPolicy: Never
             containers:
               - name: webserver
-                image: "jointakahe/takahe:{{ takahe.version }}"
+                image: "docker.io/avaraline/incarnator:{{ takahe.version }}"
                 args: ["python3", "manage.py", "migrate"]
                 envFrom:
                   - configMapRef: