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.

Sign up for GitHub

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

Jump to bottom

OF-2526 Support SystemD for Debian #2563

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

OF-2526 Support SystemD for Debian #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e838a75
openfire.postinst and postrm: replace doc with a link
stokito Oct 19, 2024
e68f3a7
openfire.default: remove useless comment
stokito Oct 19, 2024
ebe7cbd
openfire.sh: reformat tabs to two spaces
stokito Oct 19, 2024
272a8c6
openfire.sh: split OS detection and $JAVA_HOME detection
stokito Oct 19, 2024
eed2580
openfire.sh: fix SC2006: Use $(...) notation instead of legacy backti…
stokito Oct 19, 2024
6852da2
openfire.sh: merge two $cygwin ifs
stokito Oct 19, 2024
8b8d53b
openfire.sh: fix shellcheck warnings
stokito Oct 19, 2024
14e83a1
openfire.sh: use same JAVA_HOME search by alternatives as the init.d …
stokito Oct 19, 2024
e4d3591
OF-2786: Openfire to use system-defined preferences for IPv6 over IPv4
guusdk Oct 19, 2024
7918021
openfire.sh: print options
stokito Oct 19, 2024
6127a33
debian package: Install /usr/share/openfire/bin/openfire.sh
stokito Oct 19, 2024
c1144d3
debian package: Install UFW rules
stokito Oct 19, 2024
c559301
admin console setup page: check JRE version with Runtime.Version
stokito Oct 19, 2024
7d97327
OF-2526: Support SystemD in Debian package
stokito Oct 19, 2024
12422c4
OF-2526: SystemD: limit resources and add openfire.slice
stokito Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions build/debian/openfire.default
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
# Defaults for openfire initscript
# sourced by /etc/init.d/openfire
# installed at /etc/default/openfire by the maintainer scripts

#
# This is a POSIX shell fragment
#

# If you wish to override the auto-detected JAVA_HOME variable, uncomment
# and change the following line.
#JAVA_HOME=/usr/java/default
Expand Down
1 change: 1 addition & 0 deletions build/debian/openfire.dirs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/etc/openfire
/usr/share/openfire/bin
/usr/share/openfire/lib
/usr/share/openfire/resources
/var/log/openfire
Expand Down
1 change: 1 addition & 0 deletions build/debian/openfire.init.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ test -x $JAVA || exit 1
DAEMON_OPTS="$DAEMON_OPTS -server -DopenfireHome=${DAEMON_DIR} \
-Dlog4j.configurationFile=${DAEMON_LIB}/log4j2.xml \
-Dlog4j2.formatMsgNoLookups=true \
-Djdk.tls.ephemeralDHKeySize=matched -Djsse.SSLEngine.acceptLargeFragments=true -Djava.net.preferIPv6Addresses=system \
-Dopenfire.lib.dir=${DAEMON_LIB} -classpath ${DAEMON_LIB}/startup.jar\
-jar ${DAEMON_LIB}/startup.jar"

Expand Down
2 changes: 2 additions & 0 deletions build/debian/openfire.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
bin/openfire.sh /usr/share/openfire/bin
lib/*.jar usr/share/openfire/lib
lib/log4j2.xml etc/openfire
resources/database usr/share/openfire/resources
conf/openfire.xml etc/openfire
conf/security.xml etc/openfire
resources/security etc/openfire
plugins var/lib/openfire
dist/* /
Copy link
Member

Choose a reason for hiding this comment

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

What's happening with this line? and why is /usr above being mixed with usr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added the dist folder for supplementary files that just needed to be copied as is. Currently there is the Systemd's openfire servise unit file and the UFW firewall rules. All the files and folders inside of it will be copied into root with the same paths.

18 changes: 1 addition & 17 deletions build/debian/openfire.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
#! /bin/sh
set -e

# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#
# quoting from the policy:
# Any necessary prompting should almost always be confined to the
# post-installation script, and should be protected with a conditional
# so that unnecessary prompting doesn't happen if a package's
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
# See https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html

case "$1" in
configure)
Expand Down
13 changes: 1 addition & 12 deletions build/debian/openfire.postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,7 @@

set -e

# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

# See https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html

case "$1" in
purge)
Expand Down
5 changes: 5 additions & 0 deletions distribution/src/assembly/basic-distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@
<filtered>true</filtered>
</fileSet>

<!-- Copy supplementary files -->
<fileSet>
<directory>${project.basedir}/src/dist</directory>
<outputDirectory>dist</outputDirectory>
</fileSet>
</fileSets>

</assembly>
Loading