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

Add lib script, rocky and almalinux support #315

Merged
merged 16 commits into from
Jul 13, 2022
Merged

Add lib script, rocky and almalinux support #315

merged 16 commits into from
Jul 13, 2022

Conversation

Linux123123
Copy link
Member

@Linux123123 Linux123123 commented Mar 25, 2022

WIP, not sure how #280 PR will adapt / be merged.

Currently panel.sh has been tested in Ubuntu 20.04 and is at least partially working.

I moved a lot of redundant logic from scripts to lib, so I may have forgotten about something. My goal is to unify as much as possible all the scripts to have the same functions available to minimize overlap.

  • panel
  • wings

README.md Outdated Show resolved Hide resolved
lib.sh Outdated Show resolved Hide resolved
@Linux123123
Copy link
Member Author

Linux123123 commented Jun 15, 2022

@vilhelmprytz the installers/panel.sh and ui/panel.sh are working (at least on ubuntu jammy) and should be ready for review. I want your opinion before I fully start working on wings part to know what is right and what is wrong.

Ignore the failed builds

Copy link
Member

@vilhelmprytz vilhelmprytz left a comment

Choose a reason for hiding this comment

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

Initial read-through: this looks very promising, nice work @Linux123123! It looks like you've done some work on Wings as well already, would it be suitable if I merged this into a new branch and continued your work on it? If so, would you be able to resolve the current conflicts with master?

@vilhelmprytz vilhelmprytz mentioned this pull request Jul 11, 2022
@Linux123123
Copy link
Member Author

Initial read-through: this looks very promising, nice work @Linux123123! It looks like you've done some work on Wings as well already, would it be suitable if I merged this into a new branch and continued your work on it? If so, would you be able to resolve the current conflicts with master?

I think I have the merge conflicts solved locally already, but yes we can continue on a new branch.

@Linux123123
Copy link
Member Author

For now, I will leave the let's encrypt logic separate in panel and wings, as one is using nginx and the other one the standalone option in certbot. Maybe could be unified down the line.

@Linux123123
Copy link
Member Author

Linux123123 commented Jul 13, 2022

Now to check for the millions of bugs introduced in this PR…

I will mark it as ready for review as in vagrant on Ubuntu jammy I can run both panel and wings scripts without any major issues.

But still need to test other distros.

@Linux123123 Linux123123 marked this pull request as ready for review July 13, 2022 14:28
@vilhelmprytz vilhelmprytz changed the base branch from master to major-refactor July 13, 2022 18:22
@vilhelmprytz
Copy link
Member

Thanks for this, I'll merge into a new branch (major-refactor) and continue work there.

@vilhelmprytz vilhelmprytz merged commit 3127621 into pterodactyl-installer:major-refactor Jul 13, 2022
@Linux123123 Linux123123 deleted the add-lib branch July 13, 2022 18:23
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.

None yet

2 participants