From bb4d83ca171e01b08c035cc2f4635596571239ee Mon Sep 17 00:00:00 2001 From: pigeonmoelleux Date: Fri, 27 Jun 2025 16:18:59 +0200 Subject: [PATCH 1/7] Ajout support sentry --- hosts/vm/neo/matrix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index 8b1c86f..1f9eba5 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -125,6 +125,7 @@ extras = [ "oidc" "postgres" + "sentry" "systemd" "url-preview" ]; From 6751c1780a009867af94b18022bad017f9c9b761 Mon Sep 17 00:00:00 2001 From: pigeonmoelleux Date: Sat, 28 Jun 2025 14:21:21 +0200 Subject: [PATCH 2/7] Ajout export metrics --- hosts/vm/neo/matrix.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index 1f9eba5..abb10c2 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -33,6 +33,7 @@ 443 8008 8448 + 9009 ]; }; @@ -47,6 +48,7 @@ server_name = "crans.org"; report_stats = false; + enable_metrics = true; public_baseurl = "https://matrix.crans.org/"; @@ -71,6 +73,22 @@ } ]; } + { + port = 9009; + bind_addresses = [ + "::1" + "127.0.0.1" + ]; + type = "metrics"; + x_forwarded = true; + tls = false; + resources = [ + { + names = [ "metrics" ]; + compress = false; + } + ]; + } ]; database = { @@ -125,7 +143,6 @@ extras = [ "oidc" "postgres" - "sentry" "systemd" "url-preview" ]; @@ -195,6 +212,15 @@ ''; }; + locations."/_synapse/metrics" = { + proxyPass = "http://localhost:9009"; + extraConfig = '' + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + ''; + }; + locations."/media" = { proxyPass = "http://localhost:11111"; extraConfig = '' From 6fc3b4dd06ebec8c608d7005dce5caf33f0d0b50 Mon Sep 17 00:00:00 2001 From: pigeonmoelleux Date: Sat, 12 Jul 2025 15:59:08 +0200 Subject: [PATCH 3/7] Configuration jitsi + oidc sur element-web --- hosts/vm/periodique/element.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hosts/vm/periodique/element.nix b/hosts/vm/periodique/element.nix index b3c43c3..550fa05 100644 --- a/hosts/vm/periodique/element.nix +++ b/hosts/vm/periodique/element.nix @@ -20,10 +20,14 @@ feature_group_calls = true; feature_element_call_video_rooms = true; }; - + oidc_static_clients = { + "https://note.crans.org/o/" = { + client_id = "iLfIXR823xLKmLJvk0hJsIJNaozkExH4MllZldIH"; + }; + }; # https://github.com/element-hq/element-web/blob/develop/docs/jitsi.md - "jitsi" = { - "preferred_domain" = "jitsi.crans.org"; + jitsi = { + preferred_domain = "jitsi.crans.org"; }; }; }; From efc876b7fe07938b4bb945c9395ce975a676e47e Mon Sep 17 00:00:00 2001 From: Lzebulon Date: Sun, 3 Aug 2025 16:46:34 +0200 Subject: [PATCH 4/7] add server notice --- hosts/vm/neo/matrix.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index abb10c2..c2be6fb 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -133,6 +133,18 @@ app_service_config_files = [ "/var/lib/matrix-appservice-irc/registration.yml" ]; + + # https://element-hq.github.io/synapse/latest/server_notices.html + server_notices = { + system_mxid_localpart = "annonces"; + system_mxid_display_name = "Serveur Information"; + # c'est une image envoye dans un salon qui appartient à Lzebulon... + system_mxid_avatar_url = "mxc://crans.org/LGFNjmEqqWCIEUFGIptHtSSM"; + room_name = "Serveur Information"; + room_avatar_url = "mxc://crans.org/LGFNjmEqqWCIEUFGIptHtSSM"; + room_topic = "Salon utilisé par les administrateurs du serveur pour vous informer d'information importantes"; + auto_join = true + } }; extraConfigFiles = [ From 2c0da0620413c0ddf273731298277d636413af1a Mon Sep 17 00:00:00 2001 From: Lzebulon Date: Sun, 3 Aug 2025 16:49:23 +0200 Subject: [PATCH 5/7] fix typo --- hosts/vm/neo/matrix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index c2be6fb..1b67e67 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -143,8 +143,8 @@ room_name = "Serveur Information"; room_avatar_url = "mxc://crans.org/LGFNjmEqqWCIEUFGIptHtSSM"; room_topic = "Salon utilisé par les administrateurs du serveur pour vous informer d'information importantes"; - auto_join = true - } + auto_join = true; + }; }; extraConfigFiles = [ From 968ca0d8f7cd3291356ec643fef50aa17aeab2b9 Mon Sep 17 00:00:00 2001 From: Lzebulon Date: Sun, 3 Aug 2025 17:10:59 +0200 Subject: [PATCH 6/7] fix name serveur notice --- hosts/vm/neo/matrix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index 1b67e67..140f4f8 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -137,12 +137,12 @@ # https://element-hq.github.io/synapse/latest/server_notices.html server_notices = { system_mxid_localpart = "annonces"; - system_mxid_display_name = "Serveur Information"; + system_mxid_display_name = "Annonces"; # c'est une image envoye dans un salon qui appartient à Lzebulon... system_mxid_avatar_url = "mxc://crans.org/LGFNjmEqqWCIEUFGIptHtSSM"; - room_name = "Serveur Information"; + room_name = "Annonces"; room_avatar_url = "mxc://crans.org/LGFNjmEqqWCIEUFGIptHtSSM"; - room_topic = "Salon utilisé par les administrateurs du serveur pour vous informer d'information importantes"; + room_topic = "Salon utilisé par les administrateurs du serveur pour vous envoyer des informations importantes"; auto_join = true; }; }; From 755162be1dadc9c3e021859a317f5d8245baaa34 Mon Sep 17 00:00:00 2001 From: Pyjacpp Date: Sat, 6 Sep 2025 16:42:49 +0200 Subject: [PATCH 7/7] =?UTF-8?q?Ajout=20auto-join=20et=20mise=20=C3=A0=20jo?= =?UTF-8?q?ur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/vm/neo/matrix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index 140f4f8..feb3b62 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -134,6 +134,8 @@ "/var/lib/matrix-appservice-irc/registration.yml" ]; + auto_join_rooms = [ "#root-space:crans.org" ]; + # https://element-hq.github.io/synapse/latest/server_notices.html server_notices = { system_mxid_localpart = "annonces";