Remove hookshot
All checks were successful
Cachix / build (elendel) (push) Successful in 3m8s
Cachix / build (kholinar) (push) Successful in 8m42s
Cachix / build (marabethia) (push) Successful in 4m37s

This commit is contained in:
Charlotte Van Petegem 2025-05-30 16:06:28 +02:00
parent 6f46646911
commit 81f1ab444e
Signed by: chvp
SSH key fingerprint: SHA256:s9rb8jBVfdahqWHuBAcHCBP1wmj4eYQXZfqgz4H3E9E
5 changed files with 6 additions and 56 deletions

View file

@ -19,12 +19,6 @@
client_max_body_size 10M;
'';
};
"~ ^/_hookshot/(.*)" = {
proxyPass = "http://127.0.0.1:9000/$1";
extraConfig = ''
proxy_set_header X-Forwarded-Ssl on;
'';
};
};
}
];
@ -55,7 +49,6 @@
suppress_key_server_warning = true;
app_service_config_files = [
config.age.secrets."files/services/matrix-synapse/whatsapp-registration.yml".path
config.age.secrets."files/services/matrix-synapse/hookshot-registration.yml".path
];
};
extraConfigFiles = [
@ -97,54 +90,18 @@
Group = "mautrix-whatsapp";
};
};
matrix-hookshot = {
description = "Matrix <-> Services bridge";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "matrix-synapse.service" ];
requires = [ "matrix-synapse.service" ];
script = "${pkgs.matrix-hookshot}/bin/matrix-hookshot ${config.age.secrets."files/services/matrix-hookshot/config.yml".path} ${config.age.secrets."files/services/matrix-hookshot/registration.yml".path}";
serviceConfig = {
User = "matrix-hookshot";
Group = "matrix-hookshot";
WorkingDirectory = "/var/lib/matrix-hookshot";
};
};
};
users = {
users = {
mautrix-whatsapp = {
group = "mautrix-whatsapp";
home = "/var/lib/mautrix-whatsapp";
createHome = true;
isSystemUser = true;
};
matrix-hookshot = {
group = "matrix-hookshot";
home = "/var/lib/matrix-hookshot";
createHome = true;
isSystemUser = true;
};
};
groups = {
matrix-hookshot = { };
mautrix-whatsapp = { };
users.mautrix-whatsapp = {
group = "mautrix-whatsapp";
home = "/var/lib/mautrix-whatsapp";
createHome = true;
isSystemUser = true;
};
groups.mautrix-whatsapp = { };
};
age.secrets."files/services/matrix-hookshot/config.yml" = {
file = ../../../../secrets/files/services/matrix-hookshot/config.yml.age;
owner = "matrix-hookshot";
};
age.secrets."files/services/matrix-hookshot/registration.yml" = {
file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
owner = "matrix-hookshot";
};
age.secrets."files/services/matrix-hookshot/passkey.pem" = {
path = "/var/lib/matrix-hookshot/passkey.pem";
file = ../../../../secrets/files/services/matrix-hookshot/passkey.pem.age;
owner = "matrix-hookshot";
};
age.secrets."files/services/mautrix-whatsapp/config.yml" = {
file = ../../../../secrets/files/services/mautrix-whatsapp/config.yml.age;
owner = "mautrix-whatsapp";
@ -161,9 +118,5 @@
file = ../../../../secrets/files/services/mautrix-whatsapp/registration.yml.age;
owner = "matrix-synapse";
};
age.secrets."files/services/matrix-synapse/hookshot-registration.yml" = {
file = ../../../../secrets/files/services/matrix-hookshot/registration.yml.age;
owner = "matrix-synapse";
};
};
}

View file

@ -78,9 +78,6 @@ in
"secrets/files/programs/transmission/config.json.age".publicKeys = [ elendel ] ++ users;
"secrets/files/services/matrix-hookshot/config.yml.age".publicKeys = [ marabethia ] ++ users;
"secrets/files/services/matrix-hookshot/passkey.pem.age".publicKeys = [ marabethia ] ++ users;
"secrets/files/services/matrix-hookshot/registration.yml.age".publicKeys = [ marabethia ] ++ users;
"secrets/files/services/matrix-synapse/config.yml.age".publicKeys = [ marabethia ] ++ users;
"secrets/files/services/mautrix-whatsapp/config.yml.age".publicKeys = [ marabethia ] ++ users;
"secrets/files/services/mautrix-whatsapp/registration.yml.age".publicKeys = [ marabethia ] ++ users;