alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

services: prololo: bump flake

Browse source
This commit is contained in:
Antoine Martin 2021-09-16 16:23:52 +02:00
parent c80a5e9a87
commit 7bf83aaac3
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hosts/poseidon/default.nix
View file

@ -141,9 +141,22 @@ in
matrix_username = "prololo"; matrix_username = "prololo";
matrix_password = config.my.secrets.prololo_password; matrix_password = config.my.secrets.prololo_password;
matrix_homeserver = "https://matrix.alarsyo.net"; matrix_homeserver = "https://matrix.alarsyo.net";
matrix_room_id = config.my.secrets.prololo_room;
matrix_state_dir = "./prololo_state_dir"; matrix_state_dir = "./prololo_state_dir";
github_secret = config.my.secrets.prololo_github_secret; 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";
}
];
}; };
}; };

1
secrets/default.nix
View file

@ -23,6 +23,7 @@ with lib;
prololo_password = lib.fileContents ./prololo-password.secret; prololo_password = lib.fileContents ./prololo-password.secret;
prololo_room = lib.fileContents ./prololo-room.secret; prololo_room = lib.fileContents ./prololo-room.secret;
prololo_room2 = lib.fileContents ./prololo-room2.secret;
prololo_github_secret = lib.fileContents ./prololo-github-secret.secret; prololo_github_secret = lib.fileContents ./prololo-github-secret.secret;
}; };
} }

BIN
secrets/prololo-room2.secret Normal file
View file

Binary file not shown.

6
services/prololo.nix
View file

@ -8,7 +8,7 @@ let
domain = config.networking.domain; domain = config.networking.domain;
prololoPkg = prololoPkg =
let let
flake = builtins.getFlake "github:alarsyo/prololo-reborn?rev=40da010f5782bc760c83ac9883716970fcee40ff"; flake = builtins.getFlake "github:prologin/prololo?rev=65007253adb9f366698a450cc9343b30c8ac508f";
in in
flake.defaultPackage."x86_64-linux"; # FIXME: use correct system flake.defaultPackage."x86_64-linux"; # FIXME: use correct system
settingsFormat = pkgs.formats.yaml {}; settingsFormat = pkgs.formats.yaml {};
@ -48,9 +48,9 @@ in
Environment = [ Environment = [
"ROCKET_PORT=${toString cfg.port}" "ROCKET_PORT=${toString cfg.port}"
"ROCKET_LOG_LEVEL=normal" "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"; StateDirectory = "prololo";
WorkingDirectory = cfg.home; WorkingDirectory = cfg.home;
User = "prololo"; User = "prololo";