-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Allows specifying external account binding credentials in Caddyfile #3492
Conversation
Hmm. I think we want it to look more like this:
This means modifying the |
I initially didn't go that route because I think that means the I think I could make the parse work this way and but store multiple global options values, but that will break the symmetry of the way the method is right now |
Well, not necessarily - the Caddyfile config and internal Go structs don't need to match 1:1. I also don't like the current naming of the keys in the config, they're very opaque and not user-friendly. From a user's perspective, what the heck is "eab"? What's "kid"? Why is there a child in my config? 😂 Having the keys be nested within Take a look at |
I matched the key names to the |
Yeah we don't really are about what certbot does frankly 😛 We can take the opportunity to provide friendlier UX with the Caddyfile. |
Will changing the value stored in the global_options[acme_ca] be considered a breaking change? Are modules allowed to pull values from that map? |
I agree with @francislavoie on this one -- I prefer the block syntax, to keep everything together. I will have a chance to review in more detail this in a bit! |
Modules could probably pull from that map, but I can't envision any usecase where they really would. It's not important to external modules. This is config for the None of the modules in this list have any business doing something like that, so I'm not concerned. |
What do I do to fix the lint check? My mistake, I assumed |
@@ -7,7 +7,6 @@ | |||
storage file_system { | |||
root /data | |||
} | |||
acme_ca https://example.com |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should leave this in, actually. That should continue to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can put it back, I removed it so that I had something testing when the option wasn't specified at all,
I suspect this is why the IBM check fails? #3493 |
Yeah, don't mind that for the time being. We're fixing it 😄 |
@chrisortman Thanks for this -- I think I have a slightly better idea than what I proposed before. I'lll submit a new commit to your branch (building on what you've implemented here) in a little while and see what you think! |
@chrisortman Okay, see what you think of this. Revised syntax:
It's separate from Please try it out and let me know what you think! |
Does it need to be |
I thought about that. That's the technical, unambiguous term, though. And it's actually not the ACME account, it's specifically an external account binding -- not sure there's a way around that. The ACME account is based on your user key pair, which is managed by CertMagic according to your |
I like this better, makes it so there doesn't have to be the extra ACMECaConfig struct too |
@chrisortman Great! If it works for you, we'll merge this in. |
Yes works for me. |
On a side note, I did not expect that you would be able to push directly to my fork, has github always done that? Is it limited to the original owner or all collaborators? |
@chrisortman I believe it has always done that. There's a checkbox you can check/uncheck when making the pull request to allow commits from maintainers. I think we can only push to the branch you propose. |
Thanks @mholt I have never noticed that before. |
No description provided.