Handle masked spamassasin #73
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On some operating systems, systemctl returned "masked" with a new line, so we now handle this case as well
SandakovMM
force-pushed
the
handle-masked-spamassasin
branch
from
8b5aa39
to
58948f5
Compare
kpushkaryov
suggested changes
Sep 12, 2024
pleskdistup/actions/spamassassin.py
Outdated
| @@ -69,8 +75,8 @@ def _post_action(self) -> action.ActionResult: | |||
| return action.ActionResult() | |||
|
|
|||
| def _revert_action(self) -> action.ActionResult: | |||
| util.logged_check_call(["/usr/bin/systemctl", "enable", "spamassassin.service"]) | |||
| util.logged_check_call(["/usr/bin/systemctl", "start", "spamassassin.service"]) | |||
| util.logged_check_call(["/usr/bin/systemctl", "enable", self.spamassasin_service_name]) | |||
There was a problem hiding this comment.
Won't it fail here if the service is masked?
pleskdistup/actions/spamassassin.py
Outdated
| # Make sure the trick is preformed before any call of 'systemctl daemon-reload' | ||
| # because we change spamassassin.service configuration in scope of this action. | ||
| def __init__(self) -> None: | ||
| self.name = "handle spamassassin configuration update" | ||
| self.spamassasin_service_name = "spamassassin.service" |
There was a problem hiding this comment.
The service has been renamed to spamd in SpamAssassin 4, available e.g. on Debian 12, so to be future-proof it's better to make the name at least configurable.
added 2 commits
September 12, 2024 09:32
The service has been renamed to "spamd" on some operating systems, such as Debian 12, so we need to provide an option to change the name accordingly.
kpushkaryov
approved these changes
Sep 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.