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

httpcaddyfile: Make global options pluggable #3265

Merged
merged 4 commits into from
May 11, 2020

Conversation

francislavoie
Copy link
Member

This is a refactor to make global options be registerable like Caddyfile directives.

It makes it possible for plugins/modules to add their own global options if their configuration doesn't make sense to be inside a server block.

The only functional change here should be the error messages.

@mholt
Copy link
Member

mholt commented Apr 15, 2020

Cool! I'm surprised this works 🤔 Will look at this more after 2.0! (Edit: Thanks for the test case too.)

@mholt mholt added this to the 2.1 milestone Apr 15, 2020
@mholt mholt added the under review 🧐 Review is pending before merging label Apr 15, 2020
@francislavoie francislavoie force-pushed the pluggable-global-opts branch from 313bd56 to 048c275 Compare April 26, 2020 23:31
@francislavoie francislavoie force-pushed the pluggable-global-opts branch from ab383be to 8f769de Compare May 8, 2020 21:41
@francislavoie francislavoie requested a review from mholt May 8, 2020 21:48
@francislavoie
Copy link
Member Author

I'd like if we could merge this one earlier rather than later, useful for plugin authors and it would avoid merge conflicts to merge earlier if anything else needs to add/change global options

mholt
mholt previously approved these changes May 11, 2020
Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

@francislavoie I made a merge conflict. Sorry. 😇

@francislavoie
Copy link
Member Author

Fixed 👍

@mholt mholt merged commit dc9f4f1 into caddyserver:master May 11, 2020
@francislavoie francislavoie deleted the pluggable-global-opts branch May 11, 2020 21:01
@francislavoie francislavoie removed the under review 🧐 Review is pending before merging label Aug 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants