From cd23e35aac83d6de1bbd63187cc98f63969ce81a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 27 Sep 2024 06:38:12 +0200 Subject: [PATCH] bicep/matrix: update module and remove deprecated options --- flake.lock | 8 ++++---- flake.nix | 2 +- hosts/bicep/services/matrix/synapse.nix | 10 ---------- secrets/bicep/matrix.yaml | 8 +++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 0aecb65..401f100 100644 --- a/flake.lock +++ b/flake.lock @@ -107,16 +107,16 @@ ] }, "locked": { - "lastModified": 1717234745, - "narHash": "sha256-MFyKRdw4WQD6V3vRGbP6MYbtJhZp712zwzjW6YiOBYM=", + "lastModified": 1727410897, + "narHash": "sha256-tWsyxvf421ieWUJYgjV7m1eTdr2ZkO3vId7vmtvfFpQ=", "owner": "dali99", "repo": "nixos-matrix-modules", - "rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456", + "rev": "ff787d410cba17882cd7b6e2e22cc88d4064193c", "type": "github" }, "original": { "owner": "dali99", - "ref": "v0.6.0", + "ref": "v0.6.1", "repo": "nixos-matrix-modules", "type": "github" } diff --git a/flake.nix b/flake.nix index e67026a..e0d0e37 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git"; pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; - matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.0"; + matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.1"; matrix-next.inputs.nixpkgs.follows = "nixpkgs"; nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git"; diff --git a/hosts/bicep/services/matrix/synapse.nix b/hosts/bicep/services/matrix/synapse.nix index 0afcf4e..463be3c 100644 --- a/hosts/bicep/services/matrix/synapse.nix +++ b/hosts/bicep/services/matrix/synapse.nix @@ -22,11 +22,6 @@ in { group = config.users.users.matrix-synapse.group; }; - sops.secrets."matrix/sliding-sync/env" = { - sopsFile = ../../../../secrets/bicep/matrix.yaml; - key = "sliding-sync/env"; - }; - services.matrix-synapse-next = { enable = true; @@ -43,8 +38,6 @@ in { workers.eventPersisters = 2; workers.useUserDirectoryWorker = true; - enableSlidingSync = true; - enableNginx = true; settings = { @@ -137,9 +130,6 @@ in { }; }; - services.matrix-synapse.sliding-sync.environmentFile = config.sops.secrets."matrix/sliding-sync/env".path; - - services.redis.servers."".enable = true; services.nginx.virtualHosts."matrix.pvv.ntnu.no" = lib.mkMerge [ diff --git a/secrets/bicep/matrix.yaml b/secrets/bicep/matrix.yaml index 2fa429f..e24bf5c 100644 --- a/secrets/bicep/matrix.yaml +++ b/secrets/bicep/matrix.yaml @@ -2,8 +2,6 @@ synapse: turnconfig: ENC[AES256_GCM,data:mASRjYa4C9WRow4x0XYRrlCE5LMJUYaId+o62r1qhsyJPa2LzrI=,iv:5vYdubvMDjLS6soiWx2DzkEAATb9NFbSS/Jhuuz1yI8=,tag:wOW07CQMDbOiZNervee/pg==,type:str] user_registration: ENC[AES256_GCM,data:ZDZfEEvyw8pg0WzhrdC8747ed+ZR2ZA8/WypJd/iDkmIy2RmxOeI0sE=,iv:l61mOlvzpCql4fC/eubBSU6px21et2WcpxQ6rFl14iw=,tag:sVDEAa3xipKIi/6isCjWew==,type:str] signing_key: ENC[AES256_GCM,data:6UpfiRlX9pRM7zhdm7Mc8y8EItLzugWkHSgE0tGpEmudCTa1wc60oNbYfhKDWU81DT/U148pZOoX1A==,iv:UlqCPicPm5eNBz1xBMI3A3Rn4t/GtldNIDdMH5MMnLw=,tag:HHaw6iMjEAv5b9mjHSVpwA==,type:str] -sliding-sync: - env: ENC[AES256_GCM,data:DsU1qKTy5sn06Y0S5kFUqZHML20n6HdHUdXsQRUw,iv:/TNTc+StAZbf6pBY9CeXdxkx8E+3bak/wOqHyBNMprU=,tag:er5u4FRlSmUZrOT/sj+RhQ==,type:str] coturn: static-auth-secret: ENC[AES256_GCM,data:y5cG/LyrorkDH+8YrgcV7DY=,iv:ca90q2J3+NOy51mUBy4TMKfYMgWL4hxWDdsKIuxRBgU=,tag:hpFCns1lpi07paHyGB7tGQ==,type:str] mjolnir: @@ -70,8 +68,8 @@ sops: WEh5NFN6SFF1TlltdWFWTGw4MHRHUkUKrKIvC87xjEmwxPQhH8dN+ZuaJTCgPY28 pR62KxmoKFICLTHPpYP3euiAx5M9BWvgvCnA/US/5klpk8MtlreNFA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-10-22T00:31:46Z" - mac: ENC[AES256_GCM,data:UpnaUfRxvdyzBy5x4EC3w5LQ1qWxILTQhpyVPd9whTzQMAivAHT0pVmP9aE4T9w3NcWTaghp+f70GmQXx/OCC6DsRCWtU9pFHRj12YUowM3yB5lVTOomOLZQ9m4gUXw5I2GZHWBJn8CyosDcBMlXz2tiR91v/8Ulh6sDSAO86U0=,iv:5GcgRvbpqDEslZruKHM/TcMaF52A5X7AK41DEbrsRIQ=,tag:ndDgCRyX1aDRnzEUNmpoMw==,type:str] + lastmodified: "2024-09-27T04:34:10Z" + mac: ENC[AES256_GCM,data:FACb/Ow4s6dqjghAphCa1ZwIwX7+CRhIudQ9UlDtxB+4Bdpa/T0l73oaMa5lmmyCEyuVM3HXOFcm4I/urLtvaN+QQoqRYnUHKkdNYFhayGpeckZUNu7JWsFsQWk0kfKZEDqHIBoee7xBVzrVtRJeKVWv+JPlch4NVOakm3MitZA=,iv:rvve5MRDpDD/FblN8KaQ2PvxsYZSQPSw5oDfyko/Nvs=,tag:vuB0jYmO6AiNtZuSJ3ipBQ==,type:str] pgp: - created_at: "2024-08-04T00:03:46Z" enc: |- @@ -94,4 +92,4 @@ sops: -----END PGP MESSAGE----- fp: F7D37890228A907440E1FD4846B9228E814A2AAC unencrypted_suffix: _unencrypted - version: 3.7.3 + version: 3.8.1