summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD116
-rwxr-xr-xsystemd-wrapper.sh12
-rw-r--r--wildfly-sysusers.conf2
-rw-r--r--wildfly-tmpfiles.conf2
-rw-r--r--[-rwxr-xr-x]wildfly.install42
-rw-r--r--wildfly.service13
-rwxr-xr-xwildfly.sh21
8 files changed, 94 insertions, 143 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2604840cb230..01459064a9b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
pkgbase = wildfly
- pkgdesc = Wildfly Application Server
- pkgver = 19.0.0.Final
+ pkgdesc = Wildfly Application Server.
+ pkgver = 31.0.0
pkgrel = 1
url = http://www.wildfly.org/
install = wildfly.install
arch = any
license = LGPL
- depends = java-runtime>=8
- backup = etc/profile.d/wildfly.sh
+ depends = java-runtime>=11
+ optdepends = libaio: ActiveMQ Artemis
+ optdepends = lib32-glibc: native OpenSSL support
+ conflicts = wildfly-devel
+ options = !strip
backup = opt/wildfly/domain/configuration/application-roles.properties
backup = opt/wildfly/domain/configuration/application-users.properties
backup = opt/wildfly/domain/configuration/logging.properties
@@ -27,16 +30,12 @@ pkgbase = wildfly
backup = opt/wildfly/bin/jboss-cli-logging.properties
backup = opt/wildfly/bin/jboss-cli.xml
backup = opt/wildfly/bin/standalone.conf
- source = http://download.jboss.org/wildfly/19.0.0.Final/wildfly-19.0.0.Final.tar.gz
- source = wildfly.service
- source = wildfly.sh
- source = wildfly.install
- source = systemd-wrapper.sh
- sha256sums = 00e011f88c36b30dcf61ed1c54eb6f5d64f6bed9039e3774684fa152328e6535
- sha256sums = 65e4b22b106aa16413e5c95686969b3f16974235451d8445ce4c562299325412
- sha256sums = 3b2d059fcecb799ea8134b23ee0b77b4bc53dd99c7bd541679c4c139638b323a
- sha256sums = a360ddb4beb9c704257bd78e08e8eea69c43b410a9c93d346541158c3b9d4330
- sha256sums = 922035fcf68a66ed4b36a89370d2335941cb64ef8561e81fa6f59b5784f659e1
+ backup = etc/wildfly/wildfly.conf
+ source = https://github.com/wildfly/wildfly/releases/download/31.0.0.Final/wildfly-31.0.0.Final.tar.gz
+ source = wildfly-sysusers.conf
+ source = wildfly-tmpfiles.conf
+ sha256sums = 5cab9af315841fd7c6b9d4f1e7e7ff3d477a3f490c33cdecfca0047ecc9645de
+ sha256sums = d2c43e331a76c363a621db3bff3db93889388fd656bf786e1dc7c2a8283046ac
+ sha256sums = 796faf23aba8acacd40701dae855e66990ac3c62e71903095200023adb6e8540
pkgname = wildfly
-
diff --git a/PKGBUILD b/PKGBUILD
index dd68dd7b228e..0fe09789dd4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,67 @@
-# Wildfly Application Server package
+# Maintainer: Mohammadreza Abdollahzadeh <morealaz at gmail dot com>
+# Co-Maintainer: Stick <stick at stma dot is>
# Contributor: Holger Rauch <holger dot rauch at posteo dot de>
-# Contributor: Stick <stick at stma dot is>
-# Maintainer: Zdenek Obst <zdenek dot obst at gmail dot com>
-
+# Contributor: Zdenek Obst <zdenek dot obst at gmail dot com>
pkgname=wildfly
-pkgver=19.0.0.Final
+pkgver=31.0.0
pkgrel=1
-
-pkgdesc='Wildfly Application Server'
-arch=('any')
+pkgdesc='Wildfly Application Server.'
url='http://www.wildfly.org/'
license=('LGPL')
-depends=('java-runtime>=8')
-conficts=('wildfly-devel')
-
+arch=('any')
+depends=('java-runtime>=11')
+optdepends=('libaio: ActiveMQ Artemis'
+ 'lib32-glibc: native OpenSSL support')
+conflicts=("${pkgname}-devel")
_pkgloc=opt
-backup=(etc/profile.d/${pkgname}.sh
- ${_pkgloc}/${pkgname}/domain/configuration/application-roles.properties
- ${_pkgloc}/${pkgname}/domain/configuration/application-users.properties
- ${_pkgloc}/${pkgname}/domain/configuration/logging.properties
- ${_pkgloc}/${pkgname}/domain/configuration/mgmt-groups.properties
- ${_pkgloc}/${pkgname}/domain/configuration/mgmt-users.properties
- ${_pkgloc}/${pkgname}/domain/configuration/domain.xml
- ${_pkgloc}/${pkgname}/domain/configuration/host.xml
- ${_pkgloc}/${pkgname}/standalone/configuration/application-roles.properties
- ${_pkgloc}/${pkgname}/standalone/configuration/application-users.properties
- ${_pkgloc}/${pkgname}/standalone/configuration/logging.properties
- ${_pkgloc}/${pkgname}/standalone/configuration/mgmt-groups.properties
- ${_pkgloc}/${pkgname}/standalone/configuration/mgmt-users.properties
- ${_pkgloc}/${pkgname}/standalone/configuration/standalone.xml
- ${_pkgloc}/${pkgname}/bin/add-user.properties
- ${_pkgloc}/${pkgname}/bin/appclient.conf
- ${_pkgloc}/${pkgname}/bin/domain.conf
- ${_pkgloc}/${pkgname}/bin/jboss-cli-logging.properties
- ${_pkgloc}/${pkgname}/bin/jboss-cli.xml
- ${_pkgloc}/${pkgname}/bin/standalone.conf)
-
-install=${pkgname}.install
-
-source=(http://download.jboss.org/wildfly/${pkgver}/wildfly-${pkgver}.tar.gz
- ${pkgname}.service
- ${pkgname}.sh
- ${pkgname}.install
- systemd-wrapper.sh)
-
-sha256sums=('00e011f88c36b30dcf61ed1c54eb6f5d64f6bed9039e3774684fa152328e6535'
- '65e4b22b106aa16413e5c95686969b3f16974235451d8445ce4c562299325412'
- '3b2d059fcecb799ea8134b23ee0b77b4bc53dd99c7bd541679c4c139638b323a'
- 'a360ddb4beb9c704257bd78e08e8eea69c43b410a9c93d346541158c3b9d4330'
- '922035fcf68a66ed4b36a89370d2335941cb64ef8561e81fa6f59b5784f659e1')
+_cfgloc=etc
+_sysdloc=usr/lib/systemd/system
+backup=("${_pkgloc}/${pkgname}/domain/configuration/application-roles.properties"
+ "${_pkgloc}/${pkgname}/domain/configuration/application-users.properties"
+ "${_pkgloc}/${pkgname}/domain/configuration/logging.properties"
+ "${_pkgloc}/${pkgname}/domain/configuration/mgmt-groups.properties"
+ "${_pkgloc}/${pkgname}/domain/configuration/mgmt-users.properties"
+ "${_pkgloc}/${pkgname}/domain/configuration/domain.xml"
+ "${_pkgloc}/${pkgname}/domain/configuration/host.xml"
+ "${_pkgloc}/${pkgname}/standalone/configuration/application-roles.properties"
+ "${_pkgloc}/${pkgname}/standalone/configuration/application-users.properties"
+ "${_pkgloc}/${pkgname}/standalone/configuration/logging.properties"
+ "${_pkgloc}/${pkgname}/standalone/configuration/mgmt-groups.properties"
+ "${_pkgloc}/${pkgname}/standalone/configuration/mgmt-users.properties"
+ "${_pkgloc}/${pkgname}/standalone/configuration/standalone.xml"
+ "${_pkgloc}/${pkgname}/bin/add-user.properties"
+ "${_pkgloc}/${pkgname}/bin/appclient.conf"
+ "${_pkgloc}/${pkgname}/bin/domain.conf"
+ "${_pkgloc}/${pkgname}/bin/jboss-cli-logging.properties"
+ "${_pkgloc}/${pkgname}/bin/jboss-cli.xml"
+ "${_pkgloc}/${pkgname}/bin/standalone.conf"
+ "${_cfgloc}/${pkgname}/${pkgname}.conf")
+options=(!strip)
+install="${pkgname}.install"
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}.Final/${pkgname}-${pkgver}.Final.tar.gz"
+ "${pkgname}-sysusers.conf"
+ "${pkgname}-tmpfiles.conf")
+sha256sums=('5cab9af315841fd7c6b9d4f1e7e7ff3d477a3f490c33cdecfca0047ecc9645de'
+ 'd2c43e331a76c363a621db3bff3db93889388fd656bf786e1dc7c2a8283046ac'
+ '796faf23aba8acacd40701dae855e66990ac3c62e71903095200023adb6e8540')
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- rm -f bin/*.{bat,exe}
- install -dm755 ${pkgdir}/${_pkgloc}
- cp -R ${srcdir}/${pkgname}-${pkgver} ${pkgdir}/${_pkgloc}/${pkgname}
-
- # Prepare systemd service file
- install -Dm755 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-
- # Prepare file for environment variables to profile.d
- install -Dm755 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/${pkgname}.sh
-
- # Include wrapper script for systemd startup
- install -Dm755 ${srcdir}/systemd-wrapper.sh ${pkgdir}/${_pkgloc}/${pkgname}/bin/systemd-wrapper.sh
+ echo " -> Removing unneeded .bat and .ps1 files..."
+ rm -f "${pkgname}-${pkgver}.Final/bin/"*.{bat,ps1}
+ echo " -> Unpacking the package files..."
+ install -d -m 755 "${pkgdir}/${_pkgloc}"
+ cp -R "${pkgname}-${pkgver}.Final" "${pkgdir}/${_pkgloc}/${pkgname}"
+ install -D -m 644 "${pkgname}-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+ install -D -m 644 "${pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+ cd "${pkgname}-${pkgver}.Final/docs/contrib/scripts/systemd"
+ echo " -> Creating wildfly.conf (environment settings)..."
+ install -D -t "${pkgdir}/${_cfgloc}/${pkgname}" -m 644 wildfly.conf
+ echo " -> Placing wildfly.service in /$_sysdloc..."
+ # fix pid file location
+ sed -i 's|PIDFile=/var/run/wildfly/wildfly\.pid|PIDFile=/run/wildfly/wildfly\.pid|' wildfly.service
+ install -D -t "${pkgdir}/${_sysdloc}" -m 644 wildfly.service
+ echo " -> Copying launch.sh to the bin directory..."
+ install -D -t "${pkgdir}/${_pkgloc}/${pkgname}/bin" -m 755 launch.sh
+ chmod -R u=rwX,g=rwX,o=rX "${pkgdir}/${_pkgloc}/${pkgname}"
}
+# vim:set ts=4 sw=4 et:
diff --git a/systemd-wrapper.sh b/systemd-wrapper.sh
deleted file mode 100755
index 5eab363b62a6..000000000000
--- a/systemd-wrapper.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-source /etc/profile.d/wildfly.sh
-source /etc/profile.d/jre.sh
-
-if [ "$JBOSS_MODE" = "standalone" ]; then
- JBOSS_CONFIGS="-c $JBOSS_CONFIG"
-else
- JBOSS_CONFIGS="--domain-config=$JBOSS_DOMAIN_CONFIG --host-config=$JBOSS_HOST_CONFIG"
-fi
-
-export LAUNCH_IN_BACKGROUND=1
-exec $JBOSS_HOME/bin/$JBOSS_MODE.sh $JBOSS_CONFIGS "$@" >> $JBOSS_CONSOLE_LOG 2>&1
diff --git a/wildfly-sysusers.conf b/wildfly-sysusers.conf
new file mode 100644
index 000000000000..56bf817eea8c
--- /dev/null
+++ b/wildfly-sysusers.conf
@@ -0,0 +1,2 @@
+#Type Name ID GECOS Home directory Shell
+u wildfly - "WildFly Application Server" /opt/wildfly -
diff --git a/wildfly-tmpfiles.conf b/wildfly-tmpfiles.conf
new file mode 100644
index 000000000000..2aac345ae910
--- /dev/null
+++ b/wildfly-tmpfiles.conf
@@ -0,0 +1,2 @@
+#Type Path Mode User Group Age Argument
+Z /opt/wildfly - wildfly wildfly - -
diff --git a/wildfly.install b/wildfly.install
index 485050c3b692..dc76a746f867 100755..100644
--- a/wildfly.install
+++ b/wildfly.install
@@ -1,33 +1,27 @@
post_install() {
- . /etc/profile.d/wildfly.sh
-
- getent group $JBOSS_USER >/dev/null 2>&1 || groupadd -r $JBOSS_USER
- getent passwd $JBOSS_USER >/dev/null 2>&1 || useradd -g $JBOSS_USER -d $JBOSS_HOME -s /bin/bash -r $JBOSS_USER
- chown -R $JBOSS_USER:$JBOSS_USER $JBOSS_HOME
-
- JBOSS_PIDFILE_DIR=`dirname $JBOSS_PIDFILE`
- mkdir -p $JBOSS_PIDFILE_DIR
- chown $JBOSS_USER:$JBOSS_USER $JBOSS_PIDFILE_DIR
-
- JBOSS_CONSOLE_LOG_DIR=`dirname $JBOSS_CONSOLE_LOG`
- mkdir -p $JBOSS_CONSOLE_LOG_DIR
- chown $JBOSS_USER:$JBOSS_USER $JBOSS_CONSOLE_LOG_DIR
+ echo " -> Wildfly is installed as a systemd service."
+ echo " -> You should run the add-user script (/opt/wildfly/bin/add-user.sh) in order to add a management user"
+ echo " -> if you want to access the management console, which listens locally on port 9990."
+ echo " -> The main server listens on all networks at port 8080."
+}
- echo 'Environment/configuration variables are placed in /etc/profile.d/wildfly.sh'
- echo 'This package contains only Final versions of AS. If you are looking for Alpha/Beta/CR... versions, please get wildfly-devel package instead'
+pre_upgrade() {
+ echo " -> Stoping wildfly.service ..."
+ systemctl stop wildfly.service
+ wait
}
post_upgrade() {
- post_install $1
+ echo " -> Updating installation directory permissions ..."
+ chmod -R u=rwX,g=rwX,o=rX opt/wildfly
+ post_install "$1"
}
pre_remove() {
- . /etc/profile.d/wildfly.sh
-
- if getent passwd $JBOSS_USER >/dev/null 2>&1; then
- userdel $JBOSS_USER
- fi
- if getent group $JBOSS_USER >/dev/null 2>&1; then
- groupdel $JBOSS_USER
- fi
+ echo " -> Stoping wildfly.service ..."
+ systemctl stop wildfly.service
+ wait
+ echo " -> Disabling wildfly.service ..."
+ systemctl disable wildfly.service
}
+
diff --git a/wildfly.service b/wildfly.service
deleted file mode 100644
index f3ed738ece8a..000000000000
--- a/wildfly.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Wildfly Application Server
-
-[Service]
-Type=simple
-User=wildfly
-PIDFile=/run/wildfly/wildfly.pid
-ExecStart=/opt/wildfly/bin/systemd-wrapper.sh
-ExecReload=/opt/wildfly/bin/jboss-cli.sh --connect command=:reload
-ExecStop=/opt/wildfly/bin/jboss-cli.sh --connect command=:shutdown
-
-[Install]
-WantedBy=multi-user.target
diff --git a/wildfly.sh b/wildfly.sh
deleted file mode 100755
index a225e378fb54..000000000000
--- a/wildfly.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Location of WildFly
-export JBOSS_HOME=/opt/wildfly
-
-# Application server mode (standalone/domain)
-export JBOSS_MODE=standalone
-
-# Configuration for standalone mode
-export JBOSS_CONFIG=standalone.xml
-
-# Configuration for domain mode
-export JBOSS_DOMAIN_CONFIG=domain.xml
-export JBOSS_HOST_CONFIG=host-master.xml
-
-# The username who should own the process.
-export JBOSS_USER=wildfly
-
-# PID file
-export JBOSS_PIDFILE=/run/wildfly/wildfly.pid
-
-# Location to keep the console log
-export JBOSS_CONSOLE_LOG=/var/log/wildfly/console.log