From 266be843bf3870c60810802db774152fbe58dcb4 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 16 Apr 2024 19:53:46 +0200 Subject: [PATCH] Use preconfigured caddy with cloudflare plugin --- machines/gitea/caddy.nix | 6 +----- machines/nix-cache/configuration.nix | 6 +----- machines/proxy/configuration.nix | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/machines/gitea/caddy.nix b/machines/gitea/caddy.nix index 44b2277..bc3f812 100644 --- a/machines/gitea/caddy.nix +++ b/machines/gitea/caddy.nix @@ -8,11 +8,7 @@ { services.caddy = { enable = true; - package = inputs.caddy-with-plugins.lib.caddyWithPackages { - inherit (pkgs) caddy buildGoModule; - plugins = [ "github.com/caddy-dns/cloudflare@2fa0c8ac916ab13ee14c836e59fec9d85857e429" ]; - vendorHash = "sha256-9ogaUKtczQ3U/BFdum+tD9kWJ9CH3amR4z2ozE324bY="; - }; + package = inputs.caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare; email = "erwin@datarift.nl"; diff --git a/machines/nix-cache/configuration.nix b/machines/nix-cache/configuration.nix index a9ab314..a789d50 100644 --- a/machines/nix-cache/configuration.nix +++ b/machines/nix-cache/configuration.nix @@ -132,11 +132,7 @@ caddy = { enable = true; - package = caddy-with-plugins.lib.caddyWithPackages { - inherit (pkgs) caddy buildGoModule; - plugins = [ "github.com/caddy-dns/cloudflare@74f004e1c1ab9056288f0baf3cd4b0039d6c77f3" ]; - vendorHash = "sha256-UYNFkGK4A7DJSmin4nCo9rUD60gx80e9YZodn7uEcUM="; - }; + package = caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare; email = "erwin@datarift.nl"; diff --git a/machines/proxy/configuration.nix b/machines/proxy/configuration.nix index aab87c1..683514c 100644 --- a/machines/proxy/configuration.nix +++ b/machines/proxy/configuration.nix @@ -18,11 +18,7 @@ }; caddy-proxy = { enable = true; - package = caddy-with-plugins.lib.caddyWithPackages { - inherit (pkgs) caddy buildGoModule; - plugins = [ "github.com/caddy-dns/cloudflare@74f004e1c1ab9056288f0baf3cd4b0039d6c77f3" ]; - vendorHash = "sha256-UYNFkGK4A7DJSmin4nCo9rUD60gx80e9YZodn7uEcUM="; - }; + package = caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare; proxyHosts = [ { externalHostname = "home.datarift.nl";