Compare commits
No commits in common. "ee3f7678159f308283f9eccdbe1ed0a11cd75f60" and "dc72926262999132d7da071fdf4111477d5eab63" have entirely different histories.
ee3f767815
...
dc72926262
6 changed files with 41 additions and 4 deletions
19
flake.lock
19
flake.lock
|
@ -327,7 +327,8 @@
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
"systems": "systems"
|
"systems": "systems",
|
||||||
|
"website": "website"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
@ -345,6 +346,22 @@
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"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",
|
"root": "root",
|
||||||
|
|
10
flake.nix
10
flake.nix
|
@ -72,6 +72,11 @@
|
||||||
url = "github:nix-systems/default";
|
url = "github:nix-systems/default";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
website = {
|
||||||
|
url = "github:buffet/website";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
|
@ -115,5 +120,10 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
devShell = nixpkgs.legacyPackages.${system}.mkShell {
|
||||||
|
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
||||||
|
buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
|
||||||
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
default = true;
|
default = true;
|
||||||
useACMEHost = "buffet.sh";
|
useACMEHost = "buffet.sh";
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
extraConfig = "return 404;";
|
root = "${website}/404.html";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
./murmur.nix
|
./murmur.nix
|
||||||
./nginx.nix
|
./nginx.nix
|
||||||
./upgrade.nix
|
./upgrade.nix
|
||||||
|
./website.nix
|
||||||
|
|
||||||
../../users/maintainer
|
../../users/maintainer
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
{
|
{
|
||||||
networking.firewall.allowedTCPPorts = [80 443];
|
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|
11
hosts/ami/website.nix
Normal file
11
hosts/ami/website.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{website, ...}: {
|
||||||
|
networking.firewall.allowedTCPPorts = [80 443];
|
||||||
|
|
||||||
|
services.nginx = {
|
||||||
|
virtualHosts."buffet.sh" = {
|
||||||
|
useACMEHost = "buffet.sh";
|
||||||
|
forceSSL = true;
|
||||||
|
root = "${website}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue