aboutsummaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2024-07-07 02:37:52 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2024-07-07 02:42:45 +0200
commitc55a138ea7448b26940ee9ba1c5853b0292a19d5 (patch)
tree8f4518350b8e79a5a816fc87a8ba7e386ac151b7 /systems
parent927ea90d2d0b16b510fc9dad618ccb9ac374c4cd (diff)
downloadNix-c55a138ea7448b26940ee9ba1c5853b0292a19d5.tar.gz
Nix-c55a138ea7448b26940ee9ba1c5853b0292a19d5.tar.zst
Nix-c55a138ea7448b26940ee9ba1c5853b0292a19d5.zip
Bump zoldene version
Diffstat (limited to 'systems')
-rw-r--r--systems/zoldene/base.nix1
-rw-r--r--systems/zoldene/flake.lock6
-rw-r--r--systems/zoldene/logging.nix13
-rw-r--r--systems/zoldene/synapse.nix2
4 files changed, 18 insertions, 4 deletions
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
16 ./synapse.nix 16 ./synapse.nix
17 ]; 17 ];
18 18
19 programs.ssh.package = pkgs.openssh;
19 services.openssh = { 20 services.openssh = {
20 settings.KbdInteractiveAuthentication = false; 21 settings.KbdInteractiveAuthentication = false;
21 hostKeys = [ 22 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 @@
387 }, 387 },
388 "nixpkgs_5": { 388 "nixpkgs_5": {
389 "locked": { 389 "locked": {
390 "lastModified": 1708475490, 390 "lastModified": 1720031269,
391 "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", 391 "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
392 "owner": "NixOS", 392 "owner": "NixOS",
393 "repo": "nixpkgs", 393 "repo": "nixpkgs",
394 "rev": "0e74ca98a74bc7270d28838369593635a5db3260", 394 "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
395 "type": "github" 395 "type": "github"
396 }, 396 },
397 "original": { 397 "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
102 ingestion_burst_size_mb = 200; 102 ingestion_burst_size_mb = 200;
103 per_stream_rate_limit = "100MB"; 103 per_stream_rate_limit = "100MB";
104 per_stream_rate_limit_burst = "200MB"; 104 per_stream_rate_limit_burst = "200MB";
105 # Need to migrate to v13 schema
106 # MULTIPLE CONFIG ERRORS FOUND, PLEASE READ CAREFULLY
107 # 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
108 # 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"
109 allow_structured_metadata = false;
105 }; 110 };
106 111
107 schema_config.configs = [ 112 schema_config.configs = [
@@ -113,6 +118,14 @@ in
113 index.prefix = "index_"; 118 index.prefix = "index_";
114 index.period = "24h"; 119 index.period = "24h";
115 } 120 }
121 {
122 from = "2024-07-08";
123 store = "tsdb";
124 object_store = "filesystem";
125 schema = "v13";
126 index.prefix = "index_";
127 index.period = "24h";
128 }
116 ]; 129 ];
117 }; 130 };
118 }; 131 };
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 @@
159 DynamicUser = lib.mkForce false; 159 DynamicUser = lib.mkForce false;
160 User = "matrix-synapse"; 160 User = "matrix-synapse";
161 Group = "matrix-synapse"; 161 Group = "matrix-synapse";
162 RuntimeDirectory = "matrix-synapse"; 162 RuntimeDirectory = lib.mkForce "matrix-synapse";
163 SupplementaryGroups = [ "keys" ]; 163 SupplementaryGroups = [ "keys" ];
164 }; 164 };
165 unitConfig = { 165 unitConfig = {