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: add support for caddy v2 #97439

Merged
merged 7 commits into from Sep 8, 2020
Merged

[20.09] nixos/caddy: add support for caddy v2 #97439

merged 7 commits into from Sep 8, 2020

Conversation

KamilaBorowska
Copy link
Member

@KamilaBorowska KamilaBorowska commented Sep 8, 2020 •
edited

(cherry picked from commit 45d7f59)

Motivation for this change

This backports #97217. I very much would prefer this change to be in 20.09 release.

I'm not sure if I cherry-picked this correctly.

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.

Br1ght0ne and others added 7 commits September 8, 2020 12:43
@Br1ght0ne @KamilaBorowska
nixos/caddy: add support for v2
e2b51af 
(cherry picked from commit 8cc592a)
@Br1ght0ne @KamilaBorowska
nixos/caddy: use v2 by default
80a5560 
(cherry picked from commit d71cada)
@Br1ght0ne @KamilaBorowska
nixosTests.caddy: update to v2
54ad14a 
- Update configuration syntax
- Add filalex77 as a maintainer

(cherry picked from commit 06d2d84)
@Br1ght0ne @KamilaBorowska
caddy: 1.0.5 -> 2.0.0
9527d0b 
Rename legacy v1 to `caddy1`

(cherry picked from commit 6322325)
@Br1ght0ne @KamilaBorowska
release-notes/rl-2009: add item about Caddy v2
05eb101 
(cherry picked from commit c3a7c89)
@sephii @KamilaBorowska
caddy: address remaining MR comments for v2
efeb51f 
(cherry picked from commit b8bfe94)
@sephii @KamilaBorowska
caddy: 2.0.0 -> 2.1.1
17aa84a 
(cherry picked from commit 94ed860)
Br1ght0ne
Br1ght0ne approved these changes Sep 8, 2020
View reviewed changes
Copy link
Member

@Br1ght0ne Br1ght0ne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Br1ght0ne Br1ght0ne merged commit ff6f1a6 into NixOS:release-20.09 Sep 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Br1ght0ne Br1ght0ne Br1ght0ne approved these changes

@zimbatm zimbatm Awaiting requested review from zimbatm

@fpletz fpletz Awaiting requested review from fpletz

@kalbasit kalbasit Awaiting requested review from kalbasit

@rushmorem rushmorem Awaiting requested review from rushmorem

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@KamilaBorowska @Br1ght0ne @sephii