diff --git a/modules/nixos/server/webserver/caddy.nix b/modules/nixos/server/webserver/caddy.nix index be8cd6a..b17b89a 100644 --- a/modules/nixos/server/webserver/caddy.nix +++ b/modules/nixos/server/webserver/caddy.nix @@ -1,7 +1,7 @@ { config, lib, - self', + pkgs, ... }: let inherit (lib) mkIf mkMerge; @@ -16,7 +16,13 @@ in { } (mkIf caddy.cloudflare.enable { - package = self'.packages.caddy-with-cloudflare; + package = pkgs.caddy.withPlugins { + plugins = [ + "github.com/caddy-dns/cloudflare@v0.0.0-20240703190432-89f16b99c18e" + "github.com/WeidiDeng/caddy-cloudflare-ip@v0.0.0-20231130002422-f53b62aa13cb" + ]; + hash = "sha256-X3SNPfianAWLXnE0hpQpgaaCqIqHm0jgyp1clnQKmUg="; + }; globalConfig = '' servers { metrics diff --git a/outputs/pkgs/caddy-with-cloudflare/default.nix b/outputs/pkgs/caddy-with-cloudflare/default.nix index 1807b3b..2957fb5 100644 --- a/outputs/pkgs/caddy-with-cloudflare/default.nix +++ b/outputs/pkgs/caddy-with-cloudflare/default.nix @@ -35,7 +35,7 @@ caddy.override { installPhase = '' cp -r --reflink=auto . $out ''; - outputHash = "sha256-O3QWqgQtLOifsibyB0/UKricEGAx/3NhSjGbgu8+qgY="; + outputHash = "sha256-7FlCaHLuyESq+0YAkud7y83hY4oow7omJPTVVweEnJI="; outputHashMode = "recursive"; }; subPackages = ["."]; @@ -43,4 +43,3 @@ caddy.override { vendorHash = null; }); } -