summary refs log tree commit diff
path: root/nixos/modules/services/web-servers
diff options
context:
space:
mode:
authorSylvain Fankhauser <sephi@fhtagn.top>2023-05-14 19:50:50 +0200
committerSylvain Fankhauser <sephi@fhtagn.top>2023-07-04 11:25:08 +0200
commit27b7132e811addbe6dad8e07daf90b23bc86d3a1 (patch)
tree84e659597c28cb2b425c351cba1f8eacb6ee4586 /nixos/modules/services/web-servers
parent1f0ac736b48dbeaed1b3da975d13246b4d3a886c (diff)
downloadnixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.tar
nixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.tar.gz
nixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.tar.bz2
nixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.tar.lz
nixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.tar.xz
nixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.tar.zst
nixpkgs-27b7132e811addbe6dad8e07daf90b23bc86d3a1.zip
nixos/caddy: remove admin check
Since it introduces IFD.
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r--nixos/modules/services/web-servers/caddy/default.nix7
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index 1056b9525ac..5cc9ef6dd6d 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -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};