diff --git a/flake.lock b/flake.lock index c9a6b1e6..051e922f 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1710770850, - "narHash": "sha256-pnWnfXoKkMY/1VoeFo75FAHdEF6jcIBZahkYzGtG+8g=", + "lastModified": 1712337337, + "narHash": "sha256-iTQEjqGGktjiXwIelVFG5Roh7CRJdZ5/urK/fK2CER0=", "owner": "barrucadu", "repo": "bookdb", - "rev": "52207f919c2c4ffcc97e53a2245b1c6205dbb36d", + "rev": "6a31c214240e2874627f66beb366c7b62c49c818", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1710771283, - "narHash": "sha256-5qHny3fkzWoYCLIX67bj2pJn2Dmglx+JlOGx8BuD/xs=", + "lastModified": 1712349564, + "narHash": "sha256-RFOioYNEuYrfNFjsaMcrruOVSAr5tVPbRyTTRxq4Azk=", "owner": "barrucadu", "repo": "bookmarks", - "rev": "c6e075a6c90aa676a36b1aa516465555d9914126", + "rev": "0227acc4d6cedd58e2fbfaab0102ee092e5fb8a2", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1712437997, + "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1710771896, - "narHash": "sha256-DY6pkReic3kmJZuZWihOOjDxtk+McS6uY8zZnPGcGIg=", + "lastModified": 1711967866, + "narHash": "sha256-4ekrkNmEy56ph88TpdiHzn447ICpYdR7pBjowcOcnEA=", "owner": "barrucadu", "repo": "resolved", - "rev": "5246f7111a843ff6a9d8a0165d17b8b4615a7cb1", + "rev": "80ca9a48876f8a4264fd84d9a0d439a5c4b14bac", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1710727870, - "narHash": "sha256-Ulsx+t4SnRmjMJx4eF2Li+3rBGYhZp0XNShVjIheCfg=", + "lastModified": 1712456031, + "narHash": "sha256-vPM+DLCyiT3eKGdDBIxqsgBrbbB7lL0TR6R7FLhX1v8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b17cacfa7a6ed18f553a195a047f4e73e95da9", + "rev": "0e5eaa43f116d798c289b0bb831320a353efc905", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1710644594, - "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "lastModified": 1712458908, + "narHash": "sha256-DMgBS+jNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "rev": "39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6", "type": "github" }, "original": { diff --git a/hosts/carcosa/configuration.nix b/hosts/carcosa/configuration.nix index 52a0339f..34c65dd0 100644 --- a/hosts/carcosa/configuration.nix +++ b/hosts/carcosa/configuration.nix @@ -201,6 +201,11 @@ in ''; sops.secrets."services/caddy/fragments/misc_site".owner = config.users.users.caddy.name; + services.caddy.virtualHosts."carcosa.barrucadu.co.uk".extraConfig = '' + import common_config + redir https://www.barrucadu.co.uk + ''; + services.caddy.virtualHosts."grafana.carcosa.barrucadu.co.uk".extraConfig = '' import common_config reverse_proxy http://localhost:${toString config.services.grafana.settings.server.http_port}