diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix index 2eee87c..64d3733 100644 --- a/hosts/poseidon/default.nix +++ b/hosts/poseidon/default.nix @@ -141,9 +141,22 @@ in matrix_username = "prololo"; matrix_password = config.my.secrets.prololo_password; matrix_homeserver = "https://matrix.alarsyo.net"; - matrix_room_id = config.my.secrets.prololo_room; matrix_state_dir = "./prololo_state_dir"; github_secret = config.my.secrets.prololo_github_secret; + matrix_rooms = { + test-room = { id = config.my.secrets.prololo_room; default = true; }; + test-room2 = { id = config.my.secrets.prololo_room2; }; + }; + destinations = [ + { + regex = "^prologin/.*-playground$"; + room = "test-room2"; + } + { + regex = "^prologin/.*-\\dplayground$"; + room = "test-room2"; + } + ]; }; }; diff --git a/secrets/default.nix b/secrets/default.nix index 522b240..e2f351d 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -23,6 +23,7 @@ with lib; prololo_password = lib.fileContents ./prololo-password.secret; prololo_room = lib.fileContents ./prololo-room.secret; + prololo_room2 = lib.fileContents ./prololo-room2.secret; prololo_github_secret = lib.fileContents ./prololo-github-secret.secret; }; } diff --git a/secrets/prololo-room2.secret b/secrets/prololo-room2.secret new file mode 100644 index 0000000..905ffdb Binary files /dev/null and b/secrets/prololo-room2.secret differ diff --git a/services/prololo.nix b/services/prololo.nix index 8976551..11664f6 100644 --- a/services/prololo.nix +++ b/services/prololo.nix @@ -8,7 +8,7 @@ let domain = config.networking.domain; prololoPkg = let - flake = builtins.getFlake "github:alarsyo/prololo-reborn?rev=40da010f5782bc760c83ac9883716970fcee40ff"; + flake = builtins.getFlake "github:prologin/prololo?rev=65007253adb9f366698a450cc9343b30c8ac508f"; in flake.defaultPackage."x86_64-linux"; # FIXME: use correct system settingsFormat = pkgs.formats.yaml {}; @@ -48,9 +48,9 @@ in Environment = [ "ROCKET_PORT=${toString cfg.port}" "ROCKET_LOG_LEVEL=normal" - "RUST_LOG=rocket=info,prololo_reborn=trace" + "RUST_LOG=rocket=info,prololo=trace" ]; - ExecStart = "${prololoPkg}/bin/prololo-reborn --config ${configFile}"; + ExecStart = "${prololoPkg}/bin/prololo --config ${configFile}"; StateDirectory = "prololo"; WorkingDirectory = cfg.home; User = "prololo";