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

Support Caddy2 caddyfile #79

Merged
merged 7 commits into from
Oct 2, 2020
Merged

Conversation

klzgrad
Copy link
Contributor

@klzgrad klzgrad commented Sep 27, 2020

My users like to use Caddyfile very much so here I make it useable.

I couldn't make the test to work. The test would be copied from https://github.com/caddyserver/forwardproxy/blob/master/setup_test.go and changed to use NewTestDispenser but I always get ./forwardproxy_test.go:436:7: undefined: NewTestDispenser in go test.

@mholt
Copy link
Member

mholt commented Sep 28, 2020

Thank you!! I will take a look at this shortly.

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.

Alkrighty, thanks for working on this! I just did a quick first pass. Hopefully this is fine so far!

forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
forwardproxy.go Outdated Show resolved Hide resolved
@klzgrad
Copy link
Contributor Author

klzgrad commented Sep 29, 2020

Updated per review.

@klzgrad klzgrad requested a review from mholt September 30, 2020 13:53
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.

Thanks! This is looking better!

I just realized this file is using the wrong logger (my bad), let's update that then merge this in and see about cutting an initial release.

forwardproxy.go Outdated Show resolved Hide resolved
@klzgrad klzgrad requested a review from mholt October 2, 2020 02:30
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.

Awesome, thanks! (And we can refine/improve the logs later.)

Appreciate your help!

@mholt mholt merged commit 8d6f47b into caddyserver:caddy2 Oct 2, 2020
@klzgrad klzgrad deleted the caddy2-caddyfile branch October 2, 2020 03:15
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.

2 participants