Remove wrapper scripts to start Java directly via systemd & switch forking->notify-reload#103
Merged
Conversation
These service wrappers only replicate the default systemd behaviour. Running it directly simplifies it greatly because it also drops the need to manage the rundir, which systemd will now take care of for us. With the merge of OpenVoxProject/trapperkeeper#23, we can switch to notify. Then the service will notify systemd when the service is actually started. Signed-off-by: Tim Meusel <tim@bastelfreak.de>
We set java_bin for various operating systems, but we should have a default value. Signed-off-by: Tim Meusel <tim@bastelfreak.de>
The EnvironmentFile paths are config locations so if a user ever modified them, they're not replaced. By defining this in the service file, the packaging will update the location. The result is that even if a java location changes that a simple yum/apt upgrade will respect the new value in most situations. Signed-off-by: Tim Meusel <tim@bastelfreak.de>
Signed-off-by: Tim Meusel <tim@bastelfreak.de>
ezbake-functions.sh.erb uses the deprecated netstat from the deprecated net-tools package. But I can't find any uses of the functions in ezbake-functions.sh.erb, so let's remove it. The functions were used in the wrappers which were eliminated in #5. Fixes #13. Signed-off-by: Tim Meusel <tim@bastelfreak.de>
In 9768a77 the java binary was overridden, but this didn't have a point because it's not available when the files are rendered. They only have access to the ezbake config. This takes an approach of patching the files after the fact. It writes out backup files that are restored after. That is to deal with the fact that our build process isn't clean and is reused between multiple builds. Fixes: 9768a77 ("Use virtual Java packages on Red Hat and set java_bin") Signed-off-by: Tim Meusel <tim@bastelfreak.de>
Prior to b2de7c7 a tmpfiles config file was created to ensure the run directory exists. It was dropped, but causes the server to refuse to start up. This instead makes systemd responsible for creating it when the service starts. Fixes: b2de7c7 ("Drop service wrappers") Signed-off-by: Tim Meusel <tim@bastelfreak.de>
This is a regression from b2de7c7 Previously we had `ext/cli_defaults/*.erb`. This is still required because openvox-server ships a file there: https://github.com/OpenVoxProject/openvox-server/blob/main/resources/ext/cli_defaults/cli-defaults.sh.erb Signed-off-by: Tim Meusel <tim@bastelfreak.de>
Signed-off-by: Tim Meusel <tim@bastelfreak.de>
|
The rpm/deb packages and the JAR file for OpenVoxProject/ezbake are available in a zip archive: The rpm/deb packages and the JAR file for OpenVoxProject/ezbake are available in a zip archive: |
This file contains hidden or 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
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.
Pull Request (PR) description
This Pull Request (PR) fixes the following issues