zulip #463

Open
mdebray wants to merge 38 commits from zulip into main
Owner
No description provided.
feat(zulip): init module
Some checks failed
Check meta / check_dns (pull_request) Successful in 14s
Check meta / check_meta (pull_request) Successful in 16s
Check workflows / check_workflows (pull_request) Failing after 17s
Build all the nodes / Jaccess01 (pull_request) Successful in 21s
Build all the nodes / Jaccess04 (pull_request) Successful in 23s
Run pre-commit on all files / pre-commit (pull_request) Successful in 29s
Build all the nodes / ap01 (pull_request) Successful in 38s
Build all the nodes / bridge01 (pull_request) Successful in 50s
Build all the nodes / netcore02 (pull_request) Successful in 27s
Build all the nodes / netcore01 (pull_request) Successful in 29s
Build all the nodes / zulip02 (pull_request) Failing after 21s
Build all the nodes / build01 (pull_request) Successful in 1m0s
Build all the nodes / geo01 (pull_request) Successful in 51s
Build all the nodes / cof02 (pull_request) Successful in 56s
Build all the nodes / geo02 (pull_request) Successful in 55s
Build all the nodes / hypervisor01 (pull_request) Successful in 55s
Build all the nodes / hypervisor02 (pull_request) Successful in 54s
Build all the nodes / hypervisor03 (pull_request) Successful in 50s
Build the shell / build-shell (pull_request) Successful in 23s
Build all the nodes / lab-router01 (pull_request) Successful in 53s
Build all the nodes / compute01 (pull_request) Successful in 1m27s
Build all the nodes / iso (pull_request) Successful in 1m15s
Build all the nodes / web02 (pull_request) Successful in 1m8s
Build all the nodes / tower01 (pull_request) Successful in 1m9s
Build all the nodes / web03 (pull_request) Successful in 1m12s
Build all the nodes / vault01 (pull_request) Successful in 1m18s
Build all the nodes / rescue01 (pull_request) Successful in 1m20s
Build all the nodes / web01 (pull_request) Successful in 1m20s
Build all the nodes / storage01 (pull_request) Successful in 1m45s
Build all the nodes / krz01 (pull_request) Successful in 1m54s
929c74fdbe
Author
Owner

Depends on #526

Depends on https://git.dgnum.eu/DGNum/infrastructure/pulls/526
lbailly left a comment
Member

Pour commencer, j'ai pas encore check le module

Pour commencer, j'ai pas encore check le module
@ -0,0 +63,4 @@
+) -> Any: ...
+@overload
+def get_secret_json(key: str, default_value: Any, development_only: bool = False) -> Any: ...
+def get_secret_json(
Member

triple overload ?

triple overload ?
Author
Owner

J'ai copié collé une autre fonction de upstream. Je trouve ça bien de follow les conventions de upstream

J'ai copié collé une autre fonction de upstream. Je trouve ça bien de follow les conventions de upstream
lbailly marked this conversation as resolved
@ -0,0 +94,4 @@
- print("Mobile Push Notification Service registration successfully transferred.")
+ print("Success! Here are the received credentials:")
+ print(f"Org id: {org_id!r}")
+ print(f"Org id: {org_key!r}")
Member

f"Org key: {org_key!r}"

`f"Org key: {org_key!r}"`
mdebray marked this conversation as resolved
@ -0,0 +15,4 @@
let
python =
(python312.override {
packageOverrides = lib.composeManyExtensions [
Member

composeManyExtensions sert pas si tu as qu'un overlay

`composeManyExtensions` sert pas si tu as qu'un overlay
mdebray marked this conversation as resolved
@ -0,0 +1,21 @@
# SPDX-FileCopyrightText: 2025 Maurice Debray <maurice.debray@dgnum.eu>
Member

ce fichier n'est importé nul part, et ça logique est intégré dans pkgs/overlay.nix.

ce fichier n'est importé nul part, et ça logique est intégré dans `pkgs/overlay.nix`.
mdebray marked this conversation as resolved
@ -0,0 +48,4 @@
];
preBuild = ''
ls -lah
Member

reste de debug ig, je pense qu'on peut del

reste de debug ig, je pense qu'on peut del
mdebray marked this conversation as resolved
requested reviews from lbailly, thubrecht 2025-07-08 16:48:59 +02:00
lbailly left a comment
Member

Il y a un peu de nitpick j'avoue

Il y a un peu de nitpick j'avoue
@ -0,0 +1,54 @@
<!--
Member

C'est à jour et toujours d'actualité ?

C'est à jour et toujours d'actualité ?
@ -0,0 +7,4 @@
cfg = config.services.zulip;
in
{
config = lib.mkIf cfg.enable {
Member

Même pour les petit fichier comme celui là, je serai d'avis de quand même faire inherit (lib) mkIf

Même pour les petit fichier comme celui là, je serai d'avis de quand même faire `inherit (lib) mkIf`
@ -0,0 +6,4 @@
./nginx.nix
./camo.nix
./memcached.nix
./nginx.nix
Member

nginx.nix est importé deux fois

`nginx.nix` est importé deux fois
@ -0,0 +11,4 @@
./rabbitmq.nix
./redis.nix
./zulip.nix
];
Member

Ordre alphabétique si c'est pas dérangeant

Ordre alphabétique si c'est pas dérangeant
@ -0,0 +1,78 @@
# SPDX-FileCopyrightText: 2025 Maurice Debray <maurice.debray@dgnum.eu>
Member

Je maîtrise pas du tout NixOsTest, mais se serai peut-être bien de call ce fichier quelque part, par ex en CI

Je maîtrise pas du tout NixOsTest, mais se serai peut-être bien de call ce fichier quelque part, par ex en CI
@ -0,0 +15,4 @@
mkOption
mkEnableOption
mkPackageOption
;
Member

De manière générale, nos autres modules font

inherit (lib.types)
  attrsOf
  bool
  ...
;

si on peut garder une certaine unité là dessus je pense que c'est pas mal

De manière générale, nos autres modules font ```nix inherit (lib.types) attrsOf bool ... ; ``` si on peut garder une certaine unité là dessus je pense que c'est pas mal
@ -0,0 +16,4 @@
mkEnableOption
mkPackageOption
;
inherit (builtins) toString;
Member

il me semble pas que se soit utile de faire ça pour toString.

il me semble pas que se soit utile de faire ça pour `toString`.
@ -0,0 +41,4 @@
types.attrsOf valueType;
generate =
name: value:
pkgs.callPackage (
Member

opinion perso, mais je trouve ça bizarre de faire un callPackage pour ça, juste fait intervenir pkgs ?

opinion perso, mais je trouve ça bizarre de faire un `callPackage` pour ça, juste fait intervenir `pkgs` ?
@ -0,0 +54,4 @@
black
];
value = builtins.toJSON value;
pythonGen = ''
Member

Alors, c'est ptet moi qui a trop tendance à éviter d'utiliser des outils externe, mais j'ai l'impression que ce script se réécrit très bien avec un concatMapAttrsStringSep d'une fonction pas trop complexe

Alors, c'est ptet moi qui a trop tendance à éviter d'utiliser des outils externe, mais j'ai l'impression que ce script se réécrit très bien avec un `concatMapAttrsStringSep` d'une fonction pas trop complexe
@ -0,0 +121,4 @@
]
++ lib.optional (cfg.orgKeyFile != null) "zulip_org_key:${cfg.orgKeyFile}"
++ lib.optional (cfg.orgIdFile != null) "zulip_org_id:${cfg.orgIdFile}"
++ lib.mapAttrsToList (key: path: "${key}:${path}") cfg.extraSecrets;
Member

tu peut rajouter optional et mapAttrsToList au inherit (lib) du début.

tu peut rajouter `optional` et `mapAttrsToList` au `inherit (lib)` du début.
@ -0,0 +145,4 @@
};
uwsgiPackage = mkOption {
type = types.package;
default = pkgs.uwsgi.override {
Member

Pour ce genre de type d'option, un defaultText produit une doc moins foireuse.

Pour ce genre de type d'option, un `defaultText` produit une doc moins foireuse.
@ -0,0 +302,4 @@
};
config = lib.mkIf cfg.enable {
services.zulip = {
zulipSettings = {
Member

tu peux pas mettre default = { }; dans la déclaration de l'option ?

tu peux pas mettre `default = { };` dans la déclaration de l'option ?
@ -0,0 +354,4 @@
serviceConfig = {
User = "zulip";
Group = "zulip";
ExecStartPre = lib.getExe zulipInit;
Member

comme un peu plus haut, getExe dans le inherit (lib)

comme un peu plus haut, `getExe` dans le `inherit (lib)`
@ -0,0 +392,4 @@
inherit LoadCredential;
# TODO: Hardening
};
Member

tu peux factoriser une bonne partie des options de serviceConfig, genre User, Group, inherit LoadCredential, WorkingDirectory...

tu peux factoriser une bonne partie des options de `serviceConfig`, genre `User`, `Group`, `inherit LoadCredential`, `WorkingDirectory`...
fix(zulip): fix licensing information
Some checks failed
Check meta / check_dns (pull_request) Successful in 18s
Check workflows / check_workflows (pull_request) Successful in 20s
Build all the nodes / Jaccess01 (pull_request) Successful in 23s
Build all the nodes / Jaccess04 (pull_request) Successful in 23s
Run pre-commit on all files / pre-commit (push) Successful in 27s
Run pre-commit on all files / pre-commit (pull_request) Successful in 36s
Build all the nodes / ap01 (pull_request) Successful in 41s
Build all the nodes / netcore01 (pull_request) Successful in 26s
Build all the nodes / netcore02 (pull_request) Successful in 26s
Build all the nodes / build01 (pull_request) Successful in 58s
Build all the nodes / geo01 (pull_request) Successful in 59s
Build all the nodes / hypervisor01 (pull_request) Successful in 59s
Build all the nodes / bridge01 (pull_request) Successful in 1m0s
Build all the nodes / hypervisor02 (pull_request) Successful in 1m0s
Build all the nodes / geo02 (pull_request) Successful in 1m0s
Build all the nodes / cof02 (pull_request) Successful in 1m3s
Build all the nodes / lab-router01 (pull_request) Successful in 52s
Build all the nodes / hypervisor03 (pull_request) Successful in 55s
Build all the nodes / iso (pull_request) Successful in 1m0s
Build all the nodes / compute01 (pull_request) Successful in 1m19s
Build all the nodes / rescue01 (pull_request) Successful in 1m4s
Build the shell / build-shell (pull_request) Successful in 28s
Build all the nodes / storage01 (pull_request) Successful in 54s
Build all the nodes / krz01 (pull_request) Successful in 1m19s
Build all the nodes / tower01 (pull_request) Successful in 52s
Build all the nodes / zulip01 (pull_request) Failing after 38s
Build all the nodes / vault01 (pull_request) Successful in 55s
Build all the nodes / web02 (pull_request) Successful in 47s
Build all the nodes / web03 (pull_request) Successful in 52s
Build all the nodes / web01 (pull_request) Successful in 1m6s
fecedf3b28
fix: temporary hack because of dns migration
Some checks failed
Check workflows / check_workflows (pull_request) Successful in 20s
Build all the nodes / Jaccess04 (pull_request) Successful in 24s
Build all the nodes / Jaccess01 (pull_request) Successful in 30s
Run pre-commit on all files / pre-commit (push) Successful in 36s
Run pre-commit on all files / pre-commit (pull_request) Successful in 39s
Build all the nodes / netcore02 (pull_request) Successful in 25s
Build all the nodes / ap01 (pull_request) Successful in 44s
Build all the nodes / netcore01 (pull_request) Successful in 28s
Build all the nodes / bridge01 (pull_request) Successful in 48s
Build all the nodes / geo01 (pull_request) Successful in 53s
Build all the nodes / hypervisor01 (pull_request) Successful in 54s
Build all the nodes / cof02 (pull_request) Successful in 1m4s
Build all the nodes / geo02 (pull_request) Successful in 1m9s
Build all the nodes / hypervisor02 (pull_request) Successful in 1m10s
Build all the nodes / hypervisor03 (pull_request) Successful in 1m9s
Build all the nodes / lab-router01 (pull_request) Successful in 1m10s
Build all the nodes / iso (pull_request) Successful in 1m11s
Build all the nodes / build01 (pull_request) Successful in 1m12s
Build all the nodes / compute01 (pull_request) Successful in 1m19s
Build all the nodes / external01 (pull_request) Failing after 1m19s
Build all the nodes / zulip01 (pull_request) Failing after 26s
Build all the nodes / storage01 (pull_request) Successful in 1m2s
Build all the nodes / tower01 (pull_request) Successful in 58s
Build all the nodes / krz01 (pull_request) Successful in 1m27s
Build the shell / build-shell (pull_request) Successful in 33s
Build all the nodes / rescue01 (pull_request) Successful in 1m10s
Build all the nodes / web02 (pull_request) Successful in 53s
Build all the nodes / vault01 (pull_request) Successful in 55s
Build all the nodes / web03 (pull_request) Successful in 53s
Build all the nodes / web01 (pull_request) Successful in 1m7s
ae9d67f6e4
Some checks failed
Check meta / check_dns (push) Successful in 15s
Required
Details
Check meta / check_meta (pull_request) Successful in 16s
Required
Details
Check meta / check_meta (push) Successful in 16s
Required
Details
Check meta / check_dns (pull_request) Successful in 25s
Required
Details
Check workflows / check_workflows (pull_request) Successful in 27s
Required
Details
Build all the nodes / Jaccess04 (pull_request) Successful in 33s
Required
Details
Build all the nodes / Jaccess01 (pull_request) Successful in 33s
Required
Details
Run pre-commit on all files / pre-commit (pull_request) Failing after 33s
Required
Details
Build all the nodes / ap01 (pull_request) Successful in 37s
Required
Details
Run pre-commit on all files / pre-commit (push) Failing after 44s
Required
Details
Build all the nodes / build01 (pull_request) Successful in 52s
Required
Details
Build all the nodes / geo01 (pull_request) Successful in 52s
Required
Details
Build all the nodes / hypervisor01 (pull_request) Successful in 52s
Required
Details
Build all the nodes / netcore01 (pull_request) Successful in 23s
Required
Details
Build all the nodes / netcore02 (pull_request) Successful in 23s
Required
Details
Build all the nodes / geo02 (pull_request) Successful in 1m0s
Required
Details
Build all the nodes / bridge01 (pull_request) Successful in 1m2s
Required
Details
Build all the nodes / cof02 (pull_request) Successful in 1m5s
Required
Details
Build all the nodes / hypervisor03 (pull_request) Successful in 58s
Required
Details
Build all the nodes / compute01 (pull_request) Successful in 1m13s
Required
Details
Build all the nodes / hypervisor02 (pull_request) Successful in 1m0s
Required
Details
Build all the nodes / lab-router01 (pull_request) Successful in 52s
Required
Details
Build all the nodes / iso (pull_request) Successful in 1m2s
Required
Details
Build all the nodes / rescue01 (pull_request) Failing after 25s
Required
Details
Build all the nodes / storage01 (pull_request) Failing after 28s
Required
Details
Build all the nodes / zulip01 (pull_request) Failing after 28s
Required
Details
Build all the nodes / tower01 (pull_request) Successful in 45s
Required
Details
Build the shell / build-shell (pull_request) Successful in 26s
Required
Details
Build all the nodes / vault01 (pull_request) Successful in 1m3s
Required
Details
Build all the nodes / krz01 (pull_request) Successful in 1m36s
Required
Details
Build all the nodes / web02 (pull_request) Successful in 58s
Required
Details
Build all the nodes / web03 (pull_request) Successful in 57s
Required
Details
Build all the nodes / web01 (pull_request) Successful in 1m5s
Required
Details
Build all the nodes / external01 (pull_request) Failing after 4m15s
Required
Details
This pull request has changes requested by an official reviewer.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin zulip:zulip
git switch zulip
Sign in to join this conversation.
No description provided.