From 89ffc75db225d3013eb6f8515c1308688282beee Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Mon, 11 May 2026 21:49:20 +0200
Subject: [PATCH] Fix sops APIKEY

---
 modules/server/containers/apps/collabora.nix | 1 +
 modules/server/containers/apps/etherpad.nix  | 6 ++++--
 modules/server/sops/server.yaml              | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/server/containers/apps/collabora.nix b/modules/server/containers/apps/collabora.nix
index e1c0518..69de459 100644
--- a/modules/server/containers/apps/collabora.nix
+++ b/modules/server/containers/apps/collabora.nix
@@ -13,6 +13,7 @@ in {
       extraEnv = {
         "aliasgroup1" = "https://${serverCfg.containers.nextcloud.subdomain}.${serverCfg.hostDomain}";
         "server_name" = "${containerCfg.subdomain}.${serverCfg.hostDomain}";
+        "username" = "collabora_user";
         "VIRTUAL_HOST" = "${containerCfg.subdomain}.${serverCfg.hostDomain}";
         "VIRTUAL_PORT" = "9980";
         "VIRTUAL_PROTO" = "http";
diff --git a/modules/server/containers/apps/etherpad.nix b/modules/server/containers/apps/etherpad.nix
index 1ecb439..b7d3257 100644
--- a/modules/server/containers/apps/etherpad.nix
+++ b/modules/server/containers/apps/etherpad.nix
@@ -112,8 +112,10 @@ in {
     trigger = "server";
     script = pkgs.writeShellScript "setup" ''
       # Define the command wrapper
-      EXEC="${pkgs.podman}/bin/podman --events-backend=none exec --env-file ${config.sops.secrets."CUSTOM".path} etherpad-server sh -c"
-      $EXEC "echo \"$APIKEY\" > ./APIKEY.txt"
+      EXEC="${pkgs.podman}/bin/podman --events-backend=none exec --env-file ${config.sops.secrets."ETHERPAD".path} etherpad-server sh -c"
+
+      $EXEC "echo \"\$APIKEY - $APIKEY\" "
+      $EXEC "echo \"\$APIKEY\" > ./APIKEY.txt"
     '';
   };
 
diff --git a/modules/server/sops/server.yaml b/modules/server/sops/server.yaml
index 4fa4070..aa6f5a3 100644
--- a/modules/server/sops/server.yaml
+++ b/modules/server/sops/server.yaml
@@ -2,7 +2,7 @@ CUSTOM: ENC[AES256_GCM,data:OVhE99dmudlV31Re2/fyFurXnRSM3RjbdVDxYp6oF4kazaseISlI
 TRAEFIK: ENC[AES256_GCM,data:Ei+/OL7xwNaOEg3rSaz95N78nvp51lC63XCplNzeD+bBMGcK9G7HoyQxfpaJ7S0MkuMW0ZXT2nJ4GES40GoJCZIrnEiSBm2tpjDfNjlS/rFwxx0wVfM1nsEuBf3pL5dqiCNa9+Lad2Cd,iv:d1MH0ive+E8xuUK0CIOXZeEigHJKVGlFaq0iH4KSbZA=,tag:VTARuNeotr2I0+fdOk+iqA==,type:str]
 AUTHENTIK: ENC[AES256_GCM,data:dZ+Kf85ZjaZ82coYNeNOXe5zfD2M9rEeOB6jDNoaKmo3jMABhnha+iBvYJTI2NltkGzymPJQI+JV8F6GdT1l6cqcR8p0nNjQjS1BMk0rR7n8RCp6MazUTJuIjbEq6zEUrA4SXquw5gZDEp4FLo010PhoLaLinHg8OoqzjDsTxdcKevbQWmZeefDBrwXWpz6BlkRIQA3KazVb0w7l1jDTIkozUIWbvtvtk5ccGjzx3b+wCC36QYFcHHtPvFZwMDHzFPVBd90hWc/BwFfvCExONmH0S7GLFTp7I5NsBnWpT0AHUHHc5PlSR2dUy9H2DZ3IkORdNVzOaqESbYKymuWTQBDQuyI9IJdt4Cac0CV9i6p8rFXL6fQyQKZ9djHX8orpyCUeJXqFs8I6et+IzpTeZcmdv/76Q9tomBBi4k4PRMXpeff8Bn02bOSb7RSaj5NVeWxIhZkh3sEXUeva5/yrAYT30mrLpbwzWoCaKrPCPLIcFxvNrYxPUo6kVVz1jSlBurvcKefbreJGqA==,iv:Hj7aBfDLSqRBzueN8b9F9TutpjMESFloqrnirSmnH9U=,tag:1ikt1JvuhIZCx68nh/VzMA==,type:str]
 NEXTCLOUD: ENC[AES256_GCM,data:IWitzubILQ5SrGdO3UQZboisqAECt5lXOqHVg4yAKxedG7ZLOgVp6jPV+4VVDC13KEkxIsiYjjNvjqnOXCdYWQIC13YZ+o2IBDI9PgavBB3nmjfi0Q7BVki6C8qCtbM5H9uFlQ3h7rkPyEbE3pHa3dY5uwgdtmvw3qKf2UAZGIJCU7dKamjuTCucGitOEG434jFQik9duHZs7EV3AZrkLXqOfdvftvdpciDb/4/K7h/4uEYSXJ94Lf0b16/NRUcR,iv:1UvcbqC3hJEHU9t6Z+N226DTJEcgM315ynYkxPKpYSM=,tag:FGkXlUw+7LRu1/cpMys7OA==,type:str]
-COLLABORA: ENC[AES256_GCM,data:tY4LLma/7Ut9J/6C3GRyjRn30CAP76hT573++cLqGj7/BSb8uEkU0sJ/CUmSEJvxLqnoFgjc+XWe+NJSiNMWKYfnHvf1DglMntkJB+BgvnbYvHAYOHOAJO6Jp7YhrYvXdy+HoT4DNaQbcDhYuYI=,iv:uPxznygpX6gtmJ7dZ/WrbxyuMjup0wtbBPS7xYinrwI=,tag:rdqrSIokAbkRzP4FLxqYLw==,type:str]
+COLLABORA: ENC[AES256_GCM,data:cLGEziks5dyxTF1jugfpQE0l0nSkDP7MpROzCxCM94jv49sguA+d/SnY1olE8ZP9iCBnlvbMZyNR7uYo88B92Pmv8wVWfeuhHiHFIXh5aaOxntpt80UMg3Jy,iv:gmFG7C893QPuZ4rEqllAlUpNIXMcGsf9+/QCPLhWLTM=,tag:WpKHCUk6zhQRfFX2d6OPbQ==,type:str]
 ETHERPAD: ENC[AES256_GCM,data:PSr06GyOgY0HDNC4Hr2XUjbNUszGlfBjxDbrrKNQOqSMSVfZj4iFIGamrS72WO0un4U7IENx0T6CTBN/ELoq7J/+W9zf879uzKWuNaAulLVtBqrUbbqA7hTJpidnveZXzdwZRvlz/bU8kWAmXyhiDb2Q42Sz3BDb6duM3PO1AgG8Ko1pi2IemCPjO3uzudeT8FAlO8NnCUxKgwIKSz8CodOXFVGk66NX4xJd4ycfdNYXvKBNlzt1+WuWsZeZzeWmF7WD2dt4wWA9fWxB90fnth6ZV5LdeXjyYnzwkFOWoyNazgqV4jBv+aXKVwX4fYvspu13cVdrak3gc698bS2N1guDss4A/sfXMbtaYPGm98xXkqz1LP7sXQzKUdZf9sAS9gtOVv2tmg==,iv:uQ0Roe+XefzMjZCF3It+U2D1MWPMT5f6CPwlz0gQ5W0=,tag:wSgp0CVr6Y6M3eqcoTy8cw==,type:str]
 GITEA: ENC[AES256_GCM,data:KNFahbogAbmQngGh8RvUEk+QlWM1wXWj70Sf1oxSg+R2JLasyg5wslz16Q1IDN6ubXMyxTqw0GxstvqjrON444SKjAhbgoeHUf2vavYG1hqOdJEbkk9PUwN9sFyPJbA0PSeRMbm2nv4zr48jgtUz9d5rETdWR+U99qY8vx8DzVnnfz6ebeyxbQekXPnZ9Vosj49iPDsyrAvFlcE2WZHIsAGKhM0Gno+3b6AR4yZmMCjbT/TE89ZhRyxufw8E9aVVbSiNr7L2ZA39nO8LrQAZp6TklyVq6LBCXd4TTWqoPExF1fKJoJNBr1JhP/D7pzO7sgmJdgJ9Fkgm3JRQ+LATPKAuZYsLIoah9WzexPUQXSu4AjrO9DNTV2yn9+b/vAoTciHhpDEQBveZ7/rpOICnOQHFnRHp3wLTSeMY6Qp7dM9H8xqPcXYp1lUBcqChpDmL3HO5hp8Cuovp5OaIM0KLV1MuKxmLJy8jBmAix0BtkK8Hu61O0MX6Xx+fqICufzmLQ/LNe7CYUiieHP6/M6nmVPZrwEeIjWapSQPZG2AuMu5iwNQ4,iv:HHhpzprxxijGV8NioucRibFpNH5DG507Q6o3l7xbxqU=,tag:0vdRnxCJPTr5AcSUY5VUDw==,type:str]
 sops:
@@ -25,8 +25,8 @@ sops:
             S1NaTVFTL0FCdm1EQmRsUnlhclZNZlEKEgIe60qkvY8+UocjQU+WM2dTL/1y3Kqk
             d4RrlLP9NSozwVsPYI4ntygvMSApbT4v0YvoO7gV90lkGWEvW1YDfA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-05-11T17:21:42Z"
-    mac: ENC[AES256_GCM,data:EMvP51jh39Pz7o5zTU4B4kia7yScQTSmZ3qnoDwcxVKTqe7eL/ESQKEIl3n6uzTVQxkumXnmDNDtl2HrL1Zezy9fEJ3GPdAJjGGcuyhYtKF0o/G0bWBwKspVKX9XYZD955pF1ikcIb55gx1LSNa4lmsHTD5LaIFwa/DM4blJVWI=,iv:C+1ggyeWkNHN3tJGxKDvdWi4KoHNsYCD+xjpYj0Xoh4=,tag:N1D0lKtztowQIrqJvzcKyw==,type:str]
+    lastmodified: "2026-05-11T19:41:48Z"
+    mac: ENC[AES256_GCM,data:QcsSKUsRGS2mI2vwTFZA143MxL7HcmJZPCiUeviOxoVENlNGfYER1BlDEg2ju6Em+yFAygIpfnNE99sGD7rIuJrQAQ8cVzX4epgzysOQ9tRzWRbl2ekQZnIeFOuuMCTQ87wzUkTa1i3ndj/B167P+iDic1WH/M3s8WJGs9M2v+w=,iv:VK0lYuFRlFCJR1Oou+6R3WME9sEHU86jQz/e/l4R2sM=,tag:TYPrwu+GixcWgTNdVB09Eg==,type:str]
     pgp:
         - created_at: "2026-05-05T23:46:27Z"
           enc: |-