b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/caddy: remove admin check

Browse source 
Since it introduces IFD.
This commit is contained in:
Sylvain Fankhauser 2023-05-14 19:50:50 +02:00
parent 1f0ac736b4
commit 27b7132e81
No known key found for this signature in database
GPG key ID: 4228AB9EC0612ADA
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/web-servers/caddy/default.nix
View file

@ -41,10 +41,6 @@ let
in
"${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile";
adminDisabled = lib.fileContents (pkgs.runCommand "caddy-config-adapted" {} ''
${cfg.package}/bin/caddy adapt --config ${configFile} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"} | ${pkgs.jq}/bin/jq .admin.disabled > $out
'') == "true";
etcConfigFile = "caddy/caddy_config";
configPath = "/etc/${etcConfigFile}";
@ -312,9 +308,6 @@ in
{ assertion = cfg.configFile == configFile -> cfg.adapter == "caddyfile" || cfg.adapter == null;
message = "To specify an adapter other than 'caddyfile' please provide your own configuration via `services.caddy.configFile`";
}
{ assertion = cfg.enableReload -> !adminDisabled;
message = "You need to remove `admin off` from your Caddy configuration in order to use `services.caddy.enableReload`";
}
] ++ map (name: mkCertOwnershipAssertion {
inherit (cfg) group user;
cert = config.security.acme.certs.${name};