Compare commits

...

3 commits

Author SHA1 Message Date
2bd8830cd0 start caddy after garage
this should eliminate the problem of caddy being down after every update
2025-07-27 21:19:32 +02:00
8a5b59965d update 2025-07-27 21:02:16 +02:00
6471ef3102 std 2025-07-27 18:21:18 +02:00
3 changed files with 5 additions and 5 deletions

View file

@ -2,7 +2,8 @@
meta =
let
my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json);
nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/7105ae3957700a9646cc4b766f5815b23ed0c682.tar.gz");
nixpkgs-hash = "50ab793786d9de88ee30ec4e4c24fb4236fc2674"; # nixos-24.11 2025-07-27
nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-hash}.tar.gz");
in
{
# Override to pin the Nixpkgs version (recommended). This option
@ -10,7 +11,7 @@
# - A path to a Nixpkgs checkout
# - The Nixpkgs lambda (e.g., import <nixpkgs>)
# - An initialized Nixpkgs attribute set
nixpkgs = import nixpkgs-path; # nixos-24.11 2025-03-21
nixpkgs = import nixpkgs-path;
specialArgs = {
website = import (fetchTarball "https://github.com/Noratrieb/website/archive/${my-projects-versions.website}.tar.gz");

View file

@ -30,6 +30,7 @@ in
age.secrets.caddy_s3_key_secret.file = ../../secrets/caddy_s3_key_secret.age;
systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.caddy_s3_key_secret.path;
systemd.services.caddy.after = [ "garage.service" ]; # the cert store depends on garage
services.caddy = {
enable = true;
package = caddy;

View file

@ -72,9 +72,7 @@ let
git = vps1;
olat = vps1;
yeet = {
A = [ (a "5.75.137.171") ];
};
std.CNAME = [ (cname "noratrieb.github.io.") ];
# --- fun shit
localhost.A = [ (a "127.0.0.1") ];