noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-10-12 22:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'caddy-cloudflare-pkg'

Browse Source
This commit is contained in:
Noah Masur
2025-10-12 17:26:05 +00:00
parent 85f09b1126 b98c3f04ab
commit 839ca079c2
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/caddy/package.nix Normal file
View File

@@ -0,0 +1,22 @@
# Caddy with Cloudflare DNS
{
pkgs,
fetchFromGitHub,
...
}:
# Maintain a static version so that the plugin hash doesn't keep breaking
(pkgs.caddy.overrideAttrs rec {
version = "2.10.2";
src = fetchFromGitHub {
owner = "caddyserver";
repo = "caddy";
tag = "v${version}";
hash = "sha256-KvikafRYPFZ0xCXqDdji1rxlkThEDEOHycK8GP5e8vk=";
};
}).withPlugins
{
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
}

1
platforms/nixos/modules/nmasur/presets/services/bind.nix
View File

@@ -24,6 +24,7 @@ let
hostnames.download hostnames.download
hostnames.photos hostnames.photos
hostnames.audiobooks hostnames.audiobooks
hostnames.paperless
]; ];
mkRecord = service: "${service} A ${localIp}"; mkRecord = service: "${service} A ${localIp}";
localRecords = lib.concatLines (map mkRecord localServices); localRecords = lib.concatLines (map mkRecord localServices);

5
platforms/nixos/modules/nmasur/presets/services/cloudflare/cloudflare.nix
View File

@@ -66,10 +66,7 @@ in
nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges; nmasur.presets.services.caddy.cidrAllowlist = cloudflareIpRanges;
# Tell Caddy to use Cloudflare DNS for ACME challenge validation # Tell Caddy to use Cloudflare DNS for ACME challenge validation
services.caddy.package = pkgs.caddy.withPlugins { services.caddy.package = pkgs.nmasur.caddy;
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI=";
};
nmasur.presets.services.caddy.tlsPolicies = [ nmasur.presets.services.caddy.tlsPolicies = [
{ {
issuers = [ issuers = [