Compare commits

..

3 commits

3 changed files with 7 additions and 4 deletions
configuration/services/conduit

View file

@ -46,7 +46,7 @@ in
inherit (registration) ExecStartPre; inherit (registration) ExecStartPre;
ExecStart = lib.concatStringsSep " " [ ExecStart = lib.concatStringsSep " " [
"${lib.getExe pkgs.heisenbridge}" "${lib.getExe pkgs.heisenbridge}"
"--config ${registration.runtimeRegistration}" "--config \${RUNTIME_DIRECTORY}/heisenbridge-registration.yaml"
"--owner @tlater:matrix.tlater.net" "--owner @tlater:matrix.tlater.net"
"http://localhost:${toString conduitCfg.settings.global.port}" "http://localhost:${toString conduitCfg.settings.global.port}"
]; ];

View file

@ -16,6 +16,9 @@ in
# #
# This registration file needs to be manually added to conduit by # This registration file needs to be manually added to conduit by
# messaging the admin with the yaml file. # messaging the admin with the yaml file.
#
# TODO(tlater): Conduwuit seems to support a CLI interface for this,
# may want to migrate to that sometime.
writeRegistrationScript = writeRegistrationScript =
{ {
id, # Must be unique among all registered appservices/bots id, # Must be unique among all registered appservices/bots

View file

@ -37,7 +37,7 @@ let
"org.matrix.msc3202" = true; "org.matrix.msc3202" = true;
}; };
runtimeRegistration = "/var/lib/matrix-hookshot/registration.yaml"; runtimeRegistration = "${cfg.registrationFile}";
}; };
in in
{ {
@ -49,7 +49,7 @@ in
inherit (registration) ExecStartPre; inherit (registration) ExecStartPre;
# Some library in matrix-hookshot wants a home directory # Some library in matrix-hookshot wants a home directory
Environment = [ "HOME=/var/lib/matrix-hookshot" ]; Environment = [ "HOME=/run/matrix-hookshot" ];
DynamicUser = true; DynamicUser = true;
StateDirectory = "matrix-hookshot"; StateDirectory = "matrix-hookshot";
@ -80,7 +80,7 @@ in
"conduit.service" "conduit.service"
]; ];
registrationFile = "/var/lib/matrix-hookshot/registration.yaml"; registrationFile = "/run/matrix-hookshot/registration.yaml";
settings = { settings = {
bridge = { bridge = {