diff --git a/hosts/midas/services/nginx/nixfox/default.nix b/hosts/midas/services/nginx/nixfox/default.nix index c8264276..f1c43edd 100644 --- a/hosts/midas/services/nginx/nixfox/default.nix +++ b/hosts/midas/services/nginx/nixfox/default.nix @@ -1,17 +1,17 @@ { config, lib, ... }: { services.nginx.virtualHosts = { - "www.nixfox.ca" = { - enableACME = true; - addSSL = true; - default = true; - root = "/var/www/landing-page"; - }; "nixfox.ca" = { enableACME = true; addSSL = true; - globalRedirect = "www.nixfox.ca"; + + root = "/var/www/nixfox-reborn/public"; + locations = { + "/".extraConfig = '' + error_page 404 /404.html; + ''; + "/.well-known/matrix/client".extraConfig = '' default_type application/json; return 200 '{ @@ -19,6 +19,7 @@ "m.identity_server": { "base_url": "https://matrix.org" } }'; ''; + "/.well-known/matrix/server".extraConfig = '' default_type application/json; return 200 '{ "m.server": "matrix.nixfox.ca:443" }'; diff --git a/modules/system/secrets/bun-pgp-secret.asc b/modules/system/secrets/bun-pgp-secret.asc new file mode 100644 index 00000000..c7047dd9 Binary files /dev/null and b/modules/system/secrets/bun-pgp-secret.asc differ diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix index d646d278..6be3f4d5 100644 --- a/modules/system/users/main/default.nix +++ b/modules/system/users/main/default.nix @@ -11,7 +11,7 @@ ../../../../hosts/jupiter/id_ed25519.pub ]; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN3B9Uf3h5JiD2HjF/vQ5Zx9pibMgRrlf7ZoBktev9eB Warden" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE17CtOBL2xR7xelq2HjAqESJVhNtKQe9ZCECKVx0LSO Warden2" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9" ]; extraGroups = [