diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-10-30 16:02:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 16:02:44 -0400 |
| commit | 214af51225d108ce5691450862ba019620a98608 (patch) | |
| tree | eb998735c2ac00bb672b3323f68d724c6e38e2b3 /nixos/modules/services/web-servers | |
| parent | 99600df584f7565fc81020523fcda4264815c721 (diff) | |
| parent | 580f0faa7512f09a7a6fd63282603111a0d48723 (diff) | |
| download | nixpkgs-214af51225d108ce5691450862ba019620a98608.tar nixpkgs-214af51225d108ce5691450862ba019620a98608.tar.gz nixpkgs-214af51225d108ce5691450862ba019620a98608.tar.bz2 nixpkgs-214af51225d108ce5691450862ba019620a98608.tar.lz nixpkgs-214af51225d108ce5691450862ba019620a98608.tar.xz nixpkgs-214af51225d108ce5691450862ba019620a98608.tar.zst nixpkgs-214af51225d108ce5691450862ba019620a98608.zip | |
Merge pull request #101067 from deviant/remove-caddy-agree
nixos/caddy: remove services.caddy.agree
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/caddy.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 72bf9a9a1f4..63ba75e660c 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -24,6 +24,10 @@ let ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out ''; in { + imports = [ + (mkRemovedOptionModule [ "services" "caddy" "agree" ] "this option is no longer necessary for Caddy 2") + ]; + options.services.caddy = { enable = mkEnableOption "Caddy web server"; @@ -66,12 +70,6 @@ in { description = "Email address (for Let's Encrypt certificate)"; }; - agree = mkOption { - default = false; - type = types.bool; - description = "Agree to Let's Encrypt Subscriber Agreement"; - }; - dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; |