From fbcb9a66e4c1c25463bd2a0a49904b4a6f36be73 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Mon, 11 Dec 2023 15:03:38 +0100 Subject: [PATCH] small updates --- flake.lock | 42 +++++++++++------------ nixos/hosts/hades/dns/configuration.nix | 2 ++ nixos/hosts/hades/nginx/configuration.nix | 2 -- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index b1772532..82ac4fbe 100644 --- a/flake.lock +++ b/flake.lock @@ -108,11 +108,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1698440846, - "narHash": "sha256-GKvNrjbuuHoahfGK9V2UMtT6qf91SWLdXrrTITBmR6k=", + "lastModified": 1701892659, + "narHash": "sha256-vKy6Fwfb0FJeLJgmZ6DazyxrP85Fa2k4z3wWA6V2qZg=", "owner": "nix-community", "repo": "comma", - "rev": "5ecd5024b4e490a0a69628c5ae96506f141551c0", + "rev": "e37c16b39647b6805dded160c8b3c227147f2b36", "type": "github" }, "original": { @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -875,11 +875,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701656485, - "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", + "lastModified": 1702245580, + "narHash": "sha256-tTVRB42Ljo2uWGP7ei5h5/qQjOsdXoz0GHRy9hrVrdw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", + "rev": "030edbb68e69f2b97231479f98a9597024650df2", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1701653742, - "narHash": "sha256-9bLa7tsNtFSsXZDC+XVHyT6auJxUY+gObkvnEgSV7TM=", + "lastModified": 1702249933, + "narHash": "sha256-OlqCC8A6OC5n0n4meCklk73V64JcyoJQ+EGa5arhvsI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d08f6384a5d8e5cf28ab243752cd83eed2a5d700", + "rev": "0838486e9183ce39398f01b221766e68b50f405c", "type": "github" }, "original": { @@ -1161,11 +1161,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1701615100, - "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=", + "lastModified": 1701805708, + "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", + "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1701879058, - "narHash": "sha256-cOHIndHbXJ69DeYpa3srPBmAa+MuJhq1RgF1J1I3c3s=", + "lastModified": 1702228270, + "narHash": "sha256-pmhnEHGnP5n7UrWcOx/qEI0jjAhzbEianKdMqbI7gWg=", "owner": "pta2002", "repo": "nixvim", - "rev": "032f697da6ae830460095f881644da650f17a967", + "rev": "c1cbb0012685b69fc6391f93d279975032b37dcf", "type": "github" }, "original": { @@ -1196,11 +1196,11 @@ }, "nur": { "locked": { - "lastModified": 1701887101, - "narHash": "sha256-noDEwz+/eMQ3wdVML9XJOu9MiN40IoDDMOvsqSi83Pk=", + "lastModified": 1702286544, + "narHash": "sha256-40eyoDy0m02fVdyZnuDMN63alMTOTr+pmdMzlT2TNl0=", "owner": "nix-community", "repo": "NUR", - "rev": "d2163cf91fb3fd644539aeddd9ca8af12ac97e70", + "rev": "6f5d3e909a700d7db205ea7115e9661a15bee445", "type": "github" }, "original": { diff --git a/nixos/hosts/hades/dns/configuration.nix b/nixos/hosts/hades/dns/configuration.nix index 89df9fee..7e706edc 100644 --- a/nixos/hosts/hades/dns/configuration.nix +++ b/nixos/hosts/hades/dns/configuration.nix @@ -31,6 +31,7 @@ "ha.xirion.net typetransparent" "mail.xirion.net typetransparent" "plex.xirion.net typetransparent" + "fedi.xirion.net typetransparent" ]; local-data = [ @@ -45,6 +46,7 @@ ''"ha.xirion.net A 192.168.0.122"'' ''"mail.xirion.net A 192.168.0.122"'' ''"plex.xirion.net A 192.168.0.122"'' + ''"fedi.xirion.net A 192.168.0.122"'' ]; }; } diff --git a/nixos/hosts/hades/nginx/configuration.nix b/nixos/hosts/hades/nginx/configuration.nix index 9b3f24ed..0b3342f3 100644 --- a/nixos/hosts/hades/nginx/configuration.nix +++ b/nixos/hosts/hades/nginx/configuration.nix @@ -57,9 +57,7 @@ in return 301 https://fedi.xirion.net$request_uri; ''; }; - # virtualHosts."blog.xirion.net" = proxy "http://10.10.10.12"; "git.xirion.net" = proxy "http://10.10.10.12"; - # virtualHosts."mail.xirion.net" = proxy "http://192.168.0.118"; "o.xirion.net" = proxy "http://192.168.0.112:9000"; "g.xirion.net" = proxy "http://garage.hades:3900"; "requests.xirion.net" = proxy "http://overseerr.hades:5055";