From c55a138ea7448b26940ee9ba1c5853b0292a19d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 7 Jul 2024 02:37:52 +0200 Subject: [PATCH] Bump zoldene version --- deploy/flake.lock | 10 +++++----- flake.lock | 10 +++++----- flakes/flake.lock | 8 ++++---- systems/zoldene/base.nix | 1 + systems/zoldene/flake.lock | 6 +++--- systems/zoldene/logging.nix | 13 +++++++++++++ systems/zoldene/synapse.nix | 2 +- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/deploy/flake.lock b/deploy/flake.lock index de358ff..4b198c3 100644 --- a/deploy/flake.lock +++ b/deploy/flake.lock @@ -2783,7 +2783,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-DK32C6dLSeXBxrQx3B6RVyLnqIB6i9trlZlb0vkl7J4=", + "narHash": "sha256-EZcisGqD3wheTJAM1CbcbW1RsNmeIkcGTJrLxD/vP1g=", "path": "../flakes", "type": "path" }, @@ -3974,7 +3974,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KHecRLhLGIoNmSBoY/Vfr583tCRf+jxW6Y7HYln1Hoc=", + "narHash": "sha256-191b6BmFlc9NjTu9uVthcaXMQ5vbD5m0SNZEK2L5nBI=", "path": "../systems/zoldene", "type": "path" }, @@ -6374,11 +6374,11 @@ }, "nixpkgs_71": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index 2a51070..bf3a6b0 100644 --- a/flake.lock +++ b/flake.lock @@ -2664,7 +2664,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-DK32C6dLSeXBxrQx3B6RVyLnqIB6i9trlZlb0vkl7J4=", + "narHash": "sha256-EZcisGqD3wheTJAM1CbcbW1RsNmeIkcGTJrLxD/vP1g=", "path": "./flakes", "type": "path" }, @@ -3990,7 +3990,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KHecRLhLGIoNmSBoY/Vfr583tCRf+jxW6Y7HYln1Hoc=", + "narHash": "sha256-191b6BmFlc9NjTu9uVthcaXMQ5vbD5m0SNZEK2L5nBI=", "path": "../systems/zoldene", "type": "path" }, @@ -6390,11 +6390,11 @@ }, "nixpkgs_71": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/flakes/flake.lock b/flakes/flake.lock index e8924ee..3e5a0a0 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -3895,7 +3895,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KHecRLhLGIoNmSBoY/Vfr583tCRf+jxW6Y7HYln1Hoc=", + "narHash": "sha256-191b6BmFlc9NjTu9uVthcaXMQ5vbD5m0SNZEK2L5nBI=", "path": "../systems/zoldene", "type": "path" }, @@ -6202,11 +6202,11 @@ }, "nixpkgs_70": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/systems/zoldene/base.nix b/systems/zoldene/base.nix index 1b42a52..947859a 100644 --- a/systems/zoldene/base.nix +++ b/systems/zoldene/base.nix @@ -16,6 +16,7 @@ in ./synapse.nix ]; + programs.ssh.package = pkgs.openssh; services.openssh = { settings.KbdInteractiveAuthentication = false; hostKeys = [ diff --git a/systems/zoldene/flake.lock b/systems/zoldene/flake.lock index f07de8c..cbfadf4 100644 --- a/systems/zoldene/flake.lock +++ b/systems/zoldene/flake.lock @@ -387,11 +387,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/systems/zoldene/logging.nix b/systems/zoldene/logging.nix index 2b6e331..398465b 100644 --- a/systems/zoldene/logging.nix +++ b/systems/zoldene/logging.nix @@ -102,6 +102,11 @@ in ingestion_burst_size_mb = 200; per_stream_rate_limit = "100MB"; per_stream_rate_limit_burst = "200MB"; + # Need to migrate to v13 schema + # MULTIPLE CONFIG ERRORS FOUND, PLEASE READ CAREFULLY + # CONFIG ERROR: schema v13 is required to store Structured Metadata and use native OTLP ingestion, your schema version is v11. Set `allow_structured_metadata: false` in the `limits_config` section or set the command line argument `-validation.allow-structured-metadata=false` and restart Loki. Then proceed to update to schema v13 or newer before re-enabling this config, search for 'Storage Schema' in the docs for the schema update procedure + # CONFIG ERROR: `tsdb` index type is required to store Structured Metadata and use native OTLP ingestion, your index type is `boltdb-shipper` (defined in the `store` parameter of the schema_config). Set `allow_structured_metadata: false` in the `limits_config` section or set the command line argument `-validation.allow-structured-metadata=false` and restart Loki. Then proceed to update the schema to use index type `tsdb` before re-enabling this config, search for 'Storage Schema' in the docs for the schema update procedure" + allow_structured_metadata = false; }; schema_config.configs = [ @@ -113,6 +118,14 @@ in index.prefix = "index_"; index.period = "24h"; } + { + from = "2024-07-08"; + store = "tsdb"; + object_store = "filesystem"; + schema = "v13"; + index.prefix = "index_"; + index.period = "24h"; + } ]; }; }; diff --git a/systems/zoldene/synapse.nix b/systems/zoldene/synapse.nix index cfcdc9a..06a1645 100644 --- a/systems/zoldene/synapse.nix +++ b/systems/zoldene/synapse.nix @@ -159,7 +159,7 @@ DynamicUser = lib.mkForce false; User = "matrix-synapse"; Group = "matrix-synapse"; - RuntimeDirectory = "matrix-synapse"; + RuntimeDirectory = lib.mkForce "matrix-synapse"; SupplementaryGroups = [ "keys" ]; }; unitConfig = { -- 2.41.0