aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCeleste <20312-Celeste@users.gitlab.alpinelinux.org>2024-03-26 06:20:39 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2024-03-28 09:11:09 +0000
commitb1eca7e5e09376b12a5cfc3c433a999576d61db8 (patch)
treec1807d2b1401a60a15ac58b08e1a1644d3fc3fc1
parent5a2d3a41e093e849e042e35159b2ba4e457a1a43 (diff)
testing/rabbitmq-server: improve & take over maintainershipHEADmaster
-rw-r--r--testing/rabbitmq-server/APKBUILD51
-rw-r--r--testing/rabbitmq-server/rabbitmq-server.initd46
2 files changed, 35 insertions, 62 deletions
diff --git a/testing/rabbitmq-server/APKBUILD b/testing/rabbitmq-server/APKBUILD
index 1684790927a..f56f0aa4660 100644
--- a/testing/rabbitmq-server/APKBUILD
+++ b/testing/rabbitmq-server/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Nathan Johnson <nathan@nathanjohnson.info>
-# Maintainer: Nathan Johnson <nathan@nathanjohnson.info>
+# Maintainer: Celeste <cielesti@protonmail.com>
pkgname=rabbitmq-server
pkgver=3.13.0
-pkgrel=0
+pkgrel=1
pkgdesc="open source multi-protocol messaging broker"
url="https://www.rabbitmq.com/"
arch="noarch"
@@ -59,44 +59,33 @@ package() {
MANDIR=/usr/share/man \
PYTHON=python3
- mkdir -p "$pkgdir"/var/lib/rabbitmq/mnesia
- mkdir -p "$pkgdir"/var/log/rabbitmq
+ install -dm755 -o rabbitmq -g rabbitmq "$pkgdir"/var/lib/rabbitmq
+ install -dm750 -o rabbitmq -g rabbitmq "$pkgdir"/var/lib/rabbitmq/mnesia
+ install -dm755 -o rabbitmq -g rabbitmq "$pkgdir"/var/log/rabbitmq
- #Copy all necessary lib files etc.
- install -p -m755 -D "$builddir"/scripts/rabbitmq-server.ocf \
+ # Copy all necessary lib files etc.
+ install -Dvpm755 scripts/rabbitmq-server.ocf \
"$pkgdir"/usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server
- install -p -m644 -D "$srcdir/"$pkgname.logrotate \
+ install -Dvpm644 "$srcdir"/rabbitmq-server.logrotate \
"$pkgdir"/etc/logrotate.d/rabbitmq-server
- install -m755 -D "$srcdir"/$pkgname.initd \
- "$pkgdir"/etc/init.d/$pkgname
- mkdir -p "$pkgdir"/usr/sbin
+ install -Dvm755 "$srcdir"/rabbitmq-server.initd \
+ "$pkgdir"/etc/init.d/rabbitmq-server
- # This is lifted / adapted from the official upstream spec file.
- # I'd prefer a patch file, but this is probably a little easier
- # to manage since this is how they do it upstream. inb4eww
- sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
- < "$builddir"/scripts/rabbitmq-script-wrapper \
- > "$pkgdir"/usr/sbin/rabbitmqctl
-
- chmod 0755 "$pkgdir"/usr/sbin/rabbitmqctl
- for script in rabbitmq-server rabbitmq-plugins; do
- cp -a "$pkgdir"/usr/sbin/rabbitmqctl \
- "$pkgdir"/usr/sbin/$script;
+ install -Dvm755 scripts/rabbitmq-script-wrapper \
+ "$pkgdir"/usr/sbin/rabbitmqctl
+ local script; for script in rabbitmq-server rabbitmq-plugins; do
+ ln -s rabbitmqctl "$pkgdir"/usr/sbin/$script
done
- mkdir -p "$pkgdir"/usr/share/doc/"$pkgname"
- cp -a "$builddir"/LICENSE* "$pkgdir"/usr/share/doc/"$pkgname"/
- cp -a "$builddir"/deps/rabbit/docs/* "$pkgdir"/usr/share/doc/"$pkgname"/
- cp -a "$builddir"/deps/rabbitmq_sharding/docs/* "$pkgdir"/usr/share/doc/"$pkgname"/
- chmod 755 "$pkgdir"/var/lib/rabbitmq
- chmod 750 "$pkgdir"/var/lib/rabbitmq/mnesia
- chmod 755 "$pkgdir"/var/log/rabbitmq
- chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/rabbitmq
- chown -R $pkgusers:$pkggroups "$pkgdir"/var/log/rabbitmq
+ install -Dvm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname/
+ install -Dvm644 -t "$pkgdir"/usr/share/doc/$pkgname/examples/ \
+ deps/rabbit/docs/advanced.config.example \
+ deps/rabbit/docs/rabbitmq.conf.example \
+ deps/rabbit/docs/set_rabbitmq_policy.sh.example
}
sha512sums="
3bb06d5d4f56e439cb28705b16a5a7f0c113b4b42dc5f69b2e4ff7cb304eade99ba733fe409e4deb5a0c74c038d35f7b622ae8e508d4df326ddd89575fc247a6 rabbitmq-server-3.13.0.tar.xz
-a8bb02a7cae1f8720e5c7aaabfe6a2c0e731cffbe0d8f99bdcb6597daa654dc49e6d41943974601435700cf469eaa8286dc91a3255a6b9023754c3861fbb5cd9 rabbitmq-server.initd
+52413e264ae13a607262f17068ea9b9e65cc23e348d4baf45635473893758ee4571fe1b47989b1c0e69d82ec653e013955719465d37474d3e3e29c21808403f5 rabbitmq-server.initd
b8655cb048ab3b32001d4e6920bb5366696f3a5da75c053605e9b270e771c548e36858dca8338813d34376534515bba00af5e6dd7b4b1754a0e64a8fb756e3f3 rabbitmq-server.logrotate
"
diff --git a/testing/rabbitmq-server/rabbitmq-server.initd b/testing/rabbitmq-server/rabbitmq-server.initd
index caca99463c3..8fe0f05046a 100644
--- a/testing/rabbitmq-server/rabbitmq-server.initd
+++ b/testing/rabbitmq-server/rabbitmq-server.initd
@@ -1,42 +1,26 @@
#!/sbin/openrc-run
-pidfile=/run/rabbitmq/rabbitmq.pid
name=rabbitmq
-daemon=/usr/sbin/rabbitmq-server
+description="RabbitMQ Server"
+
+command=/usr/sbin/rabbitmq-server
+command_background=true
+command_user="rabbitmq:rabbitmq"
+pidfile=/run/rabbitmq/rabbitmq.pid
+
+export RABBITMQ_PID_FILE="$pidfile"
-startup_log=/var/log/rabbitmq/startup_log
-startup_err=/var/log/rabbitmq/startup_err
-shutdown_log=/var/log/rabbitmq/shutdown_log
-shutdown_err=/var/log/rabbitmq/shutdown_err
+output_log="/var/log/rabbitmq/${RC_SVCNAME}_log"
+error_log="/var/log/rabbitmq/${RC_SVCNAME}_err"
depend() {
need net localmount
after firewall
}
-start() {
- ebegin "Starting ${name}"
- # We need to test if /var/run/rabbitmq exists, since scirpt will fail if it does not
- checkpath -m 700 -o rabbitmq:rabbitmq -d "$(dirname "$pidfile")"
- checkpath -m 644 -o rabbitmq:rabbitmq --file-truncate -f $startup_log
- checkpath -m 644 -o rabbitmq:rabbitmq --file-truncate -f $startup_err
- start-stop-daemon --start \
- --env RABBITMQ_PID_FILE=$pidfile \
- --pidfile $pidfile \
- --stdout $startup_log \
- --stderr $startup_err \
- --background $daemon
- eend $?
+start_pre() {
+ # We need to test if /var/run/rabbitmq exists, since script will fail if it does not
+ checkpath -m 700 -o "$command_user" -d "$(dirname "$pidfile")"
+ checkpath -q -m 644 -o "$command_user" --file-truncate -f $output_log
+ checkpath -q -m 644 -o "$command_user" --file-truncate -f $error_log
}
-
-stop() {
- ebegin "Stopping ${name}"
- checkpath -m 644 -o rabbitmq:rabbitmq --file-truncate -f $shutdown_log
- checkpath -m 644 -o rabbitmq:rabbitmq --file-truncate -f $shutdown_err
- start-stop-daemon --stop --quiet --pidfile $pidfile \
- --exec /bin/sh -- -c "/usr/sbin/rabbitmqctl \
- --stop $pidfile > $shutdown_log \
- 2> $shutdown_err"
- eend $?
-}
-