From 2c50bb277a90936a29ec0cb9720eefbd063a3846 Mon Sep 17 00:00:00 2001
From: Jakob Meier <comcloudway@ccw.icu>
Date: Thu, 20 Jul 2023 07:57:35 +0200
Subject: [PATCH] container/calckey: upgrade to firefish v1

---
 roles/containers/calckey/README.org           |  4 ++-
 roles/containers/calckey/tasks/setup.yml      |  6 ++---
 .../containers/calckey/templates/calckey.conf | 26 ++++++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/roles/containers/calckey/README.org b/roles/containers/calckey/README.org
index abade62..6ab0ba2 100644
--- a/roles/containers/calckey/README.org
+++ b/roles/containers/calckey/README.org
@@ -1,5 +1,7 @@
 * /roles/containers/calckey
-[[https://calckey.org][Calckey]] module.
+[[https://calckey.org][Calckey]] / [[https://joinfirefish.org/][Firefish]] module.
+
+**NOTE: This role will keep refering to everything as calckey for now, so avoid migrations**
 
 Before using this,
 you probably want to set/edit the following variables
diff --git a/roles/containers/calckey/tasks/setup.yml b/roles/containers/calckey/tasks/setup.yml
index b74d09f..ff757c0 100644
--- a/roles/containers/calckey/tasks/setup.yml
+++ b/roles/containers/calckey/tasks/setup.yml
@@ -68,16 +68,16 @@
   docker_container:
     name: calckey_web
     restart_policy: unless-stopped
-    image: docker.io/thatonecalculator/calckey
+    image: codeberg.org/comcloudway/firefish-docker:latest
     ports:
       - "{{ calckey_port }}:3000"
     volumes:
       - "{{ container_dir }}\
         /{{ calckey_project_dir }}\
-        /files:/calckey/files"
+        /files:/firefish/files"
       - "{{ container_dir }}\
         /{{ calckey_project_dir }}\
-        /.config:/calckey/.config:ro"
+        /.config:/firefish/.config:ro"
     links:
       - calckey_sonic
       - calckey_db
diff --git a/roles/containers/calckey/templates/calckey.conf b/roles/containers/calckey/templates/calckey.conf
index 700c5b7..510804e 100644
--- a/roles/containers/calckey/templates/calckey.conf
+++ b/roles/containers/calckey/templates/calckey.conf
@@ -1,5 +1,5 @@
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Calckey configuration
+# Firefish configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 # After starting your server, please don't change the URL! Doing so will break federation.
@@ -14,11 +14,11 @@ url: https://{{ calckey_domain }}/
 #───┘ Port and TLS settings └───────────────────────────────────
 
 #
-# Calckey requires a reverse proxy to support HTTPS connections.
+# Firefish requires a reverse proxy to support HTTPS connections.
 #
 #                 +----- https://example.com/ ------------+
 #   +------+      |+-------------+      +----------------+|
-#   | User | ---> || Proxy (443) | ---> | Calckey (3000) ||
+#   | User | ---> || Proxy (443) | ---> | Firefish (3000) ||
 #   +------+      |+-------------+      +----------------+|
 #                 +---------------------------------------+
 #
@@ -26,7 +26,7 @@ url: https://{{ calckey_domain }}/
 #   An encrypted connection with HTTPS is highly recommended
 #   because tokens may be transferred in GET requests.
 
-# The port that your Calckey server should listen on.
+# The port that your Firefish server should listen on.
 port: 3000
 
 #   ┌──────────────────────────┐
@@ -67,6 +67,20 @@ redis:
   #db: 1
   #user: default
 
+#   ┌─────────────────────────────┐
+#───┘ Cache server configuration └─────────────────────────────────────
+
+# A Redis-compatible server (DragonflyDB, Keydb, Redis) for caching
+# If left blank, it will use the Redis server from above
+
+#cacheServer:
+  #host: localhost
+  #port: 6379
+  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
+
 # Please configure either MeiliSearch *or* Sonic.
 # If both MeiliSearch and Sonic configurations are present, MeiliSearch will take precedence.
 
@@ -108,7 +122,7 @@ id: {{ calckey_id }}
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
 
-# Maximum length of a post (default 3000, max 8192)
+# Maximum length of a post (default 3000, max 100000)
 #maxNoteLength: 3000
 
 # Maximum length of an image caption (default 1500, max 8192)
@@ -187,7 +201,7 @@ reservedUsernames: [
 
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 # Congrats, you've reached the end of the config file needed for most deployments!
-# Enjoy your Calckey server!
+# Enjoy your Firefish server!
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 
-- 
2.38.5