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.

Sign up for GitHub

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

Add Caddy webserver configuration and tutorial on Caddy with Cloudflare DNS in proxy mode #535

Merged
merged 16 commits into from
Jan 18, 2024
Merged

Add Caddy webserver configuration and tutorial on Caddy with Cloudflare DNS in proxy mode #535

merged 16 commits into from
Jan 18, 2024

Conversation

vojtechmares
Copy link
Contributor

No description provided.

@parkervcp parkervcp mentioned this pull request Jul 23, 2023
Closed
PadowYT2
PadowYT2 reviewed Aug 27, 2023
View reviewed changes
Copy link
Contributor

@PadowYT2 PadowYT2 left a comment

Choose a reason for hiding this comment

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

Can you use spaces instead of tabs? As all other snippits do

@vojtechmares
Copy link
Contributor Author

I have changed the tabs to spaces (editor default) in the snippets.

Please, consider adding an /.editorconfig to repository root direcotry in the future, so every editor behaves the same (if it supports EditorConfig).

cc @PadowYT2

@vojtechmares
Copy link
Contributor Author

Hi, the PR is getting really stale.

Can you @PadowYT2 do the code review and approve/request changes/close this PR? Thanks!

Perhaps @parkervcp, you have closed #384 in favour of this PR, can you make this PR move?

@PadowYT2
Copy link
Contributor

Can you @PadowYT2 do the code review and approve/request changes/close this PR? Thanks!

I'm not a maintainer sadly

@vojtechmares
Copy link
Contributor Author

Can you @PadowYT2 do the code review and approve/request changes/close this PR? Thanks!

I'm not a maintainer sadly

@PadowYT2 oh, I did not know that. That's unfortunate.

@parkervcp can you have a look?

PadowYT2
PadowYT2 reviewed Nov 13, 2023
View reviewed changes
Copy link
Contributor

@PadowYT2 PadowYT2 left a comment

Choose a reason for hiding this comment

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

Never used Caddy, please correct me if I'm wrong

.snippets/webservers/Caddyfile Show resolved Hide resolved
.snippets/webservers/Caddyfile Outdated Show resolved Hide resolved
.snippets/webservers/Caddyfile Outdated Show resolved Hide resolved
.snippets/webservers/Caddyfile-nossl Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
tutorials/creating_ssl_certificates.md Outdated Show resolved Hide resolved
@vojtechmares
Copy link
Contributor Author

@PadowYT2 I've pushed a new version, resolving the last conversation. Feel free to review the PR again.

PadowYT2
PadowYT2 reviewed Nov 28, 2023
View reviewed changes
Copy link
Contributor

@PadowYT2 PadowYT2 left a comment

Choose a reason for hiding this comment

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

You also messed up something with the snippits
Screenshot_2023-11-28-13-29-03-122_com.android.chrome-edit.jpg

.snippets/webservers/Caddyfile-nossl Show resolved Hide resolved
@vojtechmares
refactor(webserver_configuration.md): remove highlight from server di…
4c46daa 
…rective
@vojtechmares
refactor(webserver_configuration.md): add extra : to tabs, for hier…
8ffb97d 
…archy

- this was required to allow for `::: tip :::` inside a tab. Using only three colons resulted in formatting/rendering error
@vojtechmares
Copy link
Contributor Author

You also messed up something with the snippits Screenshot_2023-11-28-13-29-03-122_com.android.chrome-edit.jpg

Fixed. There was an issue with how many colons (:) you need to create tabs (:::: tab) with a ::: tip inside. Required one additional colon to create a hierarchy.

PadowYT2
PadowYT2 reviewed Nov 29, 2023
View reviewed changes
Copy link
Contributor

@PadowYT2 PadowYT2 left a comment

Choose a reason for hiding this comment

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

There are some more things needs to be edited

tutorials/creating_ssl_certificates.md Outdated Show resolved Hide resolved
tutorials/creating_ssl_certificates.md Outdated Show resolved Hide resolved
tutorials/creating_ssl_certificates.md Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
PadowYT2
PadowYT2 reviewed Nov 29, 2023
View reviewed changes
Copy link
Contributor

@PadowYT2 PadowYT2 left a comment

Choose a reason for hiding this comment

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

I believe only these are the final changes

panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
panel/1.0/webserver_configuration.md Outdated Show resolved Hide resolved
PadowYT2
PadowYT2 reviewed Nov 29, 2023
View reviewed changes
Copy link
Contributor

@PadowYT2 PadowYT2 left a comment

Choose a reason for hiding this comment

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

LGTM

@vojtechmares
Copy link
Contributor Author

@parkervcp I wish you merry Christmas!

Also, can you have a look at this PR and review it and perhaps merge it? Thanks!

@parkervcp
Copy link
Member

@parkervcp I wish you merry Christmas!

Also, can you have a look at this PR and review it and perhaps merge it? Thanks!

I'm on vacation and will be available to review this on the 27th.

@vojtechmares
Copy link
Contributor Author

Hi, thanks for the approval. Is there anything I can do? How can I get this merged? Thanks!

@parkervcp parkervcp merged commit fad96ab into pterodactyl:master Jan 18, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PadowYT2 PadowYT2 PadowYT2 left review comments

@DillonB07 DillonB07 DillonB07 left review comments

@parkervcp parkervcp parkervcp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vojtechmares @PadowYT2 @parkervcp @DillonB07