diff --git a/flake.lock b/flake.lock index 110cd01..67a83d8 100644 --- a/flake.lock +++ b/flake.lock @@ -327,8 +327,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "website": "website" + "systems": "systems" } }, "systems": { @@ -346,22 +345,6 @@ "repo": "default", "type": "github" } - }, - "website": { - "flake": false, - "locked": { - "lastModified": 1709301176, - "narHash": "sha256-HOnDLwHnVt6G+Gop08PYbzNDahq9SKHnPdaR5hdL244=", - "owner": "buffet", - "repo": "website", - "rev": "473559837586715998be89b928131706c5058f96", - "type": "github" - }, - "original": { - "owner": "buffet", - "repo": "website", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index efb2abf..b2a704c 100644 --- a/flake.nix +++ b/flake.nix @@ -72,11 +72,6 @@ url = "github:nix-systems/default"; flake = false; }; - - website = { - url = "github:buffet/website"; - flake = false; - }; }; outputs = { diff --git a/hosts/ami/404.nix b/hosts/ami/404.nix index c9ab726..257bd37 100644 --- a/hosts/ami/404.nix +++ b/hosts/ami/404.nix @@ -4,7 +4,7 @@ default = true; useACMEHost = "buffet.sh"; forceSSL = true; - root = "${website}/404.html"; + extraConfig = "return 404;"; }; }; } diff --git a/hosts/ami/default.nix b/hosts/ami/default.nix index 74b2d78..c813f82 100644 --- a/hosts/ami/default.nix +++ b/hosts/ami/default.nix @@ -19,7 +19,6 @@ ./murmur.nix ./nginx.nix ./upgrade.nix - ./website.nix ../../users/maintainer ]; diff --git a/hosts/ami/nginx.nix b/hosts/ami/nginx.nix index 6dfbb66..533aa3e 100644 --- a/hosts/ami/nginx.nix +++ b/hosts/ami/nginx.nix @@ -1,4 +1,6 @@ { + networking.firewall.allowedTCPPorts = [80 443]; + services.nginx = { enable = true; diff --git a/hosts/ami/website.nix b/hosts/ami/website.nix deleted file mode 100644 index 46dbd15..0000000 --- a/hosts/ami/website.nix +++ /dev/null @@ -1,11 +0,0 @@ -{website, ...}: { - networking.firewall.allowedTCPPorts = [80 443]; - - services.nginx = { - virtualHosts."buffet.sh" = { - useACMEHost = "buffet.sh"; - forceSSL = true; - root = "${website}"; - }; - }; -}