fix: use caddy module from nixos-unstable

fix: use deploy-rs overlay to force usage of nixpkgs
Merge pull request 'nachtigall: Mount /var/lib as a separate ZFS dataset' (#16 ) from var-lib-is-zfs into main
2023-10-28 15:06:57 +02:00 · 2023-10-28 15:06:57 +02:00 · 2023-10-28 14:18:27 +02:00 · 2023-10-28 14:17:13 +02:00 · 2023-10-28 14:14:29 +02:00 · 2023-10-28 14:10:25 +02:00
2 changed files with 5 additions and 1 deletions
--- a/hosts/nachtigall/apps/caddy.nix
+++ b/hosts/nachtigall/apps/caddy.nix
@ -56,7 +56,6 @@ in {
    enable = lib.mkForce true;
    group = "hakkonaut";
    email = "admins@pub.solar";
-    enableReload = true;
    globalConfig = lib.mkForce ''
      grace_period 60s
    '';
--- a/hosts/nachtigall/hardware-configuration.nix
+++ b/hosts/nachtigall/hardware-configuration.nix
@ -18,6 +18,11 @@
      fsType = "zfs";
    };

+  fileSystems."/var/lib" =
+    { device = "root_pool/data";
+      fsType = "zfs";
+    };
+
  fileSystems."/var/lib/postgresql" =
    { device = "root_pool/data/postgresql";
      fsType = "zfs";
Author	SHA1	Message	Date
teutat3s	a5b32302c1	fix: use caddy module from nixos-unstable	2023-10-28 15:06:57 +02:00
teutat3s	3c9f9c9fc7	fix: use deploy-rs overlay to force usage of nixpkgs	2023-10-28 15:06:57 +02:00
Akshay Mankar	49890bc53d	Merge pull request 'nachtigall: Mount /var/lib as a separate ZFS dataset' (#16 ) from var-lib-is-zfs into main Reviewed-on: pub-solar/infra-new#16 Reviewed-by: hensoko <hensoko@gssws.de>	2023-10-28 14:18:27 +02:00
Akshay Mankar	fcc2115c0b	Merge pull request 'nachtigall/apps/caddy: Remove option from nixos-unstable' (#15 ) from fix-caddy into main Reviewed-on: pub-solar/infra-new#15 Reviewed-by: hensoko <hensoko@gssws.de>	2023-10-28 14:17:13 +02:00
Akshay Mankar	c42fadab6d	nachtigall: Mount /var/lib as a separate ZFS dataset This would help keep all application data out of the root partion by default	2023-10-28 14:14:29 +02:00
Akshay Mankar	bdc5033bf4	nachtigall/apps/caddy: Remove option from nixos-unstable It is anyway enabled by default	2023-10-28 14:10:25 +02:00