Skip to content

Remove wrapper scripts to start Java directly via systemd & switch forking->notify-reload#103

Merged
bastelfreak merged 9 commits into
mainfrom
javafoo
Jun 1, 2026
Merged

Remove wrapper scripts to start Java directly via systemd & switch forking->notify-reload#103
bastelfreak merged 9 commits into
mainfrom
javafoo

Conversation

@bastelfreak
Copy link
Copy Markdown
Contributor

Pull Request (PR) description

This Pull Request (PR) fixes the following issues

ekohl and others added 9 commits May 29, 2026 12:06
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>
@bastelfreak bastelfreak self-assigned this Jun 1, 2026
@bastelfreak bastelfreak added the backwards-incompatible This change will lead to a major version bump for the next release label Jun 1, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 1, 2026

The rpm/deb packages and the JAR file for OpenVoxProject/ezbake are available in a zip archive:
https://github.com/OpenVoxProject/ezbake/actions/runs/26743876990/artifacts/7326875322

The rpm/deb packages and the JAR file for OpenVoxProject/ezbake are available in a zip archive:
https://github.com/OpenVoxProject/ezbake/actions/runs/26743876990/artifacts/7326897929

Copy link
Copy Markdown
Member

@rwaffen rwaffen left a comment

Choose a reason for hiding this comment

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

LGTM

@bastelfreak bastelfreak merged commit e7e60e2 into main Jun 1, 2026
45 checks passed
@bastelfreak bastelfreak deleted the javafoo branch June 1, 2026 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backwards-incompatible This change will lead to a major version bump for the next release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants