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

scripts: housekeeping & cleanup setup (2/2) #3123

Merged
merged 8 commits into from Feb 28, 2023

Conversation

georglauterbach
Copy link
Member

Description

(First) Follow up of #3115. Sibling of #3121. This is mostly a cleanup & housekeeping PR; changes are partially split from #3112 to make reviewing easier.

Commits are cleanly separated; reviewing commit-by-commit is advised.

Type of change

  • Improvement (non-breaking change that does improve existing functionality)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (README.md or the documentation under docs/)
  • If necessary I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

See commit comment for
f30f5c2

Additionally added `POSTFIX_DAGENT` to variables so it is properly set!
1. The Supervisor setup function name is now uniform with the early
   ENV var setup function
2. The functions needed for early ENV var setup were made private
   (by naming convention.. oh my)
This way, all the private functions in this stack come first.
polarathene
polarathene previously approved these changes Feb 27, 2023
Copy link
Member

@polarathene polarathene left a comment

Choose a reason for hiding this comment

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

Commits are cleanly separated; reviewing commit-by-commit is advised.

Really nice review diffs this time, quick and easy 😁 🎉

casperklein
casperklein previously approved these changes Feb 27, 2023
@casperklein
Copy link
Member

BTW: do we really need a separate fix stack? We could move those fixes into the corresponding setup functions.

@georglauterbach
Copy link
Member Author

georglauterbach commented Feb 27, 2023

BTW: do we really need a separate fix stack? We could move those fixes into the corresponding setup functions.

#3121 removed the stack entirely and did exactly what you proposed 😉

@georglauterbach
Copy link
Member Author

I will resolve conflicts tomorrow :)

The `start-daemons.sh` stack contained setup functionality, which I
moved into the setup stack (for Postgrey, whose removal of PID files was
not necessary because we already do that in `_setup_apply_fixes_after_configuration`)
& Dovevot, for which the code for starting the daemon contained plain
setup functionality entirely unrelated to the actual start).

Sorry for requiring a review for this again, but I did not want to open
yet another PR for this (since I'm currently swamping the project with
PRs). Should be fearly easy to review this commit though, so all is well
:)
@georglauterbach georglauterbach merged commit dfc2b39 into master Feb 28, 2023
@georglauterbach georglauterbach deleted the scripts/cleanup-setup-2 branch February 28, 2023 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/scripts kind/improvement Improve an existing feature, configuration file or the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants