OOYE
This commit is contained in:
parent
33d6b922d0
commit
61b5c81cb7
6 changed files with 80 additions and 14 deletions
|
@ -29,20 +29,41 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
imports = [inputs.nix-matrix-appservices.nixosModule];
|
||||
|
||||
services.matrix-appservices.services = builtins.mapAttrs (name: value:
|
||||
value
|
||||
// {
|
||||
inherit settings;
|
||||
format = "mautrix-go";
|
||||
package = value.package.override {withGoolm = true;};
|
||||
}) {
|
||||
whatsapp = {
|
||||
port = 29318;
|
||||
serviceConfig.EnvironmentFile = config.age.secrets."whatsapp.age".path;
|
||||
package = pkgs.mautrix-whatsapp;
|
||||
domain = "ooye.federated.nexus";
|
||||
in {
|
||||
imports = [inputs.nix-matrix-appservices.nixosModule inputs.ooye.modules.default];
|
||||
|
||||
services = rec {
|
||||
matrix-appservices.services = builtins.mapAttrs (name: value:
|
||||
value
|
||||
// {
|
||||
inherit settings;
|
||||
format = "mautrix-go";
|
||||
package = value.package.override {withGoolm = true;};
|
||||
}) {
|
||||
whatsapp = {
|
||||
port = 29318;
|
||||
serviceConfig.EnvironmentFile = config.age.secrets."whatsapp.age".path;
|
||||
package = pkgs.mautrix-whatsapp;
|
||||
};
|
||||
};
|
||||
|
||||
matrix-ooye = {
|
||||
enable = true;
|
||||
homeserver = config.services.grapevine.settings.server_discovery.client.base_url;
|
||||
homeserverName = "federated.nexus";
|
||||
discordTokenPath = config.age.secrets."discordToken.age".path;
|
||||
discordClientSecretPath = config.age.secrets."discordClientSecret.age".path;
|
||||
socket = "/var/lib/matrix-ooye/socket";
|
||||
bridgeOrigin = "https://${domain}";
|
||||
};
|
||||
|
||||
caddy.virtualHosts."${domain}".extraConfig = "reverse_proxy unix/${matrix-ooye.socket}";
|
||||
};
|
||||
|
||||
systemd.services.matrix-ooye.serviceConfig = {
|
||||
UMask = "0007";
|
||||
Group = "caddy";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
enable = true;
|
||||
email = "henry@henryhiles.com";
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [2222 443 8448]; # SSH,Matrix and HTTPS
|
||||
networking.firewall.allowedTCPPorts = [2222 443 8448]; # Git SSH, HTTPS, and Matrix
|
||||
}
|
||||
|
|
21
flake.lock
generated
21
flake.lock
generated
|
@ -768,6 +768,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ooye": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737779835,
|
||||
"narHash": "sha256-iZ/kQ/XFqIx053AuSHhCwu3HA8627ognYiJl/LRNpD0=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "11cc65efa2909bdc7e3e978bf1f56f6d141bf82a",
|
||||
"revCount": 11,
|
||||
"type": "git",
|
||||
"url": "https://cgit.rory.gay/nix/OOYE-module.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://cgit.rory.gay/nix/OOYE-module.git"
|
||||
}
|
||||
},
|
||||
"programsdb": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -816,6 +836,7 @@
|
|||
"nh": "nh",
|
||||
"nix-matrix-appservices": "nix-matrix-appservices",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"ooye": "ooye",
|
||||
"programsdb": "programsdb",
|
||||
"stylix": "stylix",
|
||||
"wrapper-manager": "wrapper-manager"
|
||||
|
|
|
@ -9,6 +9,10 @@
|
|||
url = "github:danth/stylix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
ooye = {
|
||||
url = "git+https://cgit.rory.gay/nix/OOYE-module.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-matrix-appservices = {
|
||||
url = "gitlab:coffeetables/nix-matrix-appservices";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
9
secrets/discordClientSecret.age
Normal file
9
secrets/discordClientSecret.age
Normal file
|
@ -0,0 +1,9 @@
|
|||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSA0d1VK
|
||||
RExQcmIxaTNTT0l1bHhxTUc2NXYvODY0MjI0STZTeXN6TjBnb0RFCndMSzU5SHM5
|
||||
UllMckhOTnlRTWJkNFpNWDNLMUpmQkRBU2REVGN3V1lUQVUKLT4ge2ohUjpwLE0t
|
||||
Z3JlYXNlCmViaUY5cUNjQThxOTlhY0lIYS8xQTRVamdnbwotLS0gRUZnTFVCTFN2
|
||||
bmk5aTdyRGxBUk1vMjdQdU5yTjIxREJaN241aTROeEJJbwqrhCTgPaqt+TJdUVnO
|
||||
xRwXyFUFmztyVpjI8jH7JcuiFbibJfGDH9jwLdtakMUNJUmuGamVI8XycwBiLtUq
|
||||
WjXOTA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
11
secrets/discordToken.age
Normal file
11
secrets/discordToken.age
Normal file
|
@ -0,0 +1,11 @@
|
|||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSBBZGtk
|
||||
R1YxTWVxSGNuS2lBZTRaSUhrNlNaOWFPOERucGhKbHdEVlBRSmtJCkFjbUErRUly
|
||||
WWl5MkdvckRrdTd5aFRiRHJoTmJhK3Y5SGtKdU1MTk1GRFEKLT4gZSo7XjItZ3Jl
|
||||
YXNlIGZ6CjdMeUFyK1BjWkVrVWJhY1RJNVNCMUVoaHlZRWliRXltQmpIb2QzVUZv
|
||||
dXBITlJVVnRGamJuTFN0ZGlCNHpmbHIKK3d4Z2xJdC8yZURDZmVDV3hxYi8wakpV
|
||||
WmN1dXpOa25udElqRm9MNjRBSW5NSWt0eEpNQnpRCi0tLSBocEpSYlpndlNpTjBi
|
||||
N3dJMmtyRXUwaEdGTHpObFV5ejZsR1lnZ05jM0pNCnzz8WE14SxOio/LCLiS6fe8
|
||||
3OY52RCfmPMYOMWwauT7PQ+MjITZeNp4pkSWnRmEhAdJRFx7mbYb/Vjg2XeE64TM
|
||||
nHEaU4yndI2VxOUq0F6/A6plnN6SYJeoWkTl9XpozIV1GHOnHvKLvw==
|
||||
-----END AGE ENCRYPTED FILE-----
|
Loading…
Add table
Add a link
Reference in a new issue