Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.09] nixos/caddy: remove services.caddy.agree #102186

Merged
merged 1 commit into from Oct 30, 2020
Merged

[20.09] nixos/caddy: remove services.caddy.agree #102186

merged 1 commit into from Oct 30, 2020

Conversation

deviant
Copy link
Member

@deviant deviant commented Oct 30, 2020

Backport of #101067.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@deviant deviant mentioned this pull request Oct 30, 2020
Merged
10 tasks
@deviant
nixos/caddy: remove services.caddy.agree
6c30370 
This option is no longer referenced anywhere as of NixOS#99371.

(cherry picked from commit 580f0fa)
@worldofpeace worldofpeace merged commit 6b2df01 into NixOS:release-20.09 Oct 30, 2020
@worldofpeace
Copy link
Contributor

thx @deviant

@deviant deviant deleted the remove-caddy-agree-backport branch October 30, 2020 21:42
@Moredread
Copy link
Contributor

This causes an error if services.caddy.package = pkgs.caddy1:

error: The option `services.caddy.agree' can no longer be used since it's been removed. this option is no longer necessary for Caddy 2

At https://github.com/deviant/nixpkgs/blob/6c30370d8dcc081daa744334ab352305525c08fb/nixos/modules/services/web-servers/caddy.nix#L115 the option is used for caddy1.

@Moredread
Copy link
Contributor

https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions lists caddy v1 as unsupported for security fixes. Not sure what we should do, but as there don't seem to be reports yet of this issue by other people it might be a good idea to deprecate caddy v1 in the module for 20.09

@Moredread Moredread mentioned this pull request Nov 29, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@deviant @worldofpeace @Moredread