From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
Date: Sun, 12 Dec 2021 18:56:00 +0000 (UTC) [thread overview]
Message-ID: <1639335331.87e27f70f0f39184b56b15971dce58e7acdd2bd6.flow@gentoo> (raw)
commit: 87e27f70f0f39184b56b15971dce58e7acdd2bd6
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 18:54:55 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 18:55:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e27f70
net-im/ejabberd: also migrate /var/spool/jabber to /var/lib/ejabberd
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-im/ejabberd/ejabberd-21.04-r2.ebuild | 41 +++++++++++++++++++++-----------
net-im/ejabberd/ejabberd-21.12.ebuild | 41 +++++++++++++++++++++-----------
2 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
index 9a2546e60e03..63128525a5ca 100644
--- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
@@ -194,7 +194,7 @@ pkg_preinst() {
}
pkg_postinst() {
- local migrate_to_etc_ejabberd=false
+ local migrate_to_ejabberd_user=false
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
@@ -204,7 +204,7 @@ pkg_postinst() {
else
for v in ${REPLACING_VERSIONS}; do
if ver_test "${v}" -lt 21.04-r1; then
- migrate_to_etc_ejabberd=true
+ migrate_to_ejabberd_user=true
break
fi
done
@@ -216,17 +216,30 @@ pkg_postinst() {
# under the, shared via net-im/jabber-base, 'jabber' use, but under
# its own user. This increase isolation and hence robustness and
# security.
- if $migrate_to_etc_ejabberd; then
- cp -r "${EROOT}"/etc/jabber/. "${EROOT}"/etc/ejabberd || die
- if [[ -f "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 ]]; then
- rm "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 || die
- fi
- if ! use prefix; then
- chown --recursive ejabberd:ejabberd "${EROOT}"/etc/ejabberd || die
- fi
- elog "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
- elog "(just as upstream) and *not* /etc/ejabber."
- elog "The files from /etc/jabber where copied to /etc/ejabberd."
- elog "Please check your configuration and delete the file in /etc/jabber."
+ if $migrate_to_ejabberd_user; then
+ local -A dirs_to_migrate=(
+ [/etc/jabber]=/etc/ejabberd
+ [/var/spool/jabber]=/var/lib/ejabberd
+ )
+
+ for src_dir in "${!dirs_to_migrate[@]}"; do
+ local eroot_src_dir="${EROOT}${src_dir}"
+ local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
+
+ cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+ if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+ rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+ fi
+ if ! use prefix; then
+ chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
+ fi
+ done
+
+ ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+ ewarn "(just as upstream) and *not* /etc/ejabber."
+ ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
+ ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
+ ewarn "Please check your configuration."
fi
}
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild b/net-im/ejabberd/ejabberd-21.12.ebuild
index e4ed2bfaac5c..3f4d03ad5e89 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -180,7 +180,7 @@ pkg_preinst() {
}
pkg_postinst() {
- local migrate_to_etc_ejabberd=false
+ local migrate_to_ejabberd_user=false
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
@@ -190,7 +190,7 @@ pkg_postinst() {
else
for v in ${REPLACING_VERSIONS}; do
if ver_test "${v}" -lt 21.04-r1; then
- migrate_to_etc_ejabberd=true
+ migrate_to_ejabberd_user=true
break
fi
done
@@ -202,17 +202,30 @@ pkg_postinst() {
# under the, shared via net-im/jabber-base, 'jabber' use, but under
# its own user. This increase isolation and hence robustness and
# security.
- if $migrate_to_etc_ejabberd; then
- cp -r "${EROOT}"/etc/jabber/. "${EROOT}"/etc/ejabberd || die
- if [[ -f "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 ]]; then
- rm "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 || die
- fi
- if ! use prefix; then
- chown --recursive ejabberd:ejabberd "${EROOT}"/etc/ejabberd || die
- fi
- elog "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
- elog "(just as upstream) and *not* /etc/ejabber."
- elog "The files from /etc/jabber where copied to /etc/ejabberd."
- elog "Please check your configuration and delete the file in /etc/jabber."
+ if $migrate_to_ejabberd_user; then
+ local -A dirs_to_migrate=(
+ [/etc/jabber]=/etc/ejabberd
+ [/var/spool/jabber]=/var/lib/ejabberd
+ )
+
+ for src_dir in "${!dirs_to_migrate[@]}"; do
+ local eroot_src_dir="${EROOT}${src_dir}"
+ local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
+
+ cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+ if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+ rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+ fi
+ if ! use prefix; then
+ chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
+ fi
+ done
+
+ ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+ ewarn "(just as upstream) and *not* /etc/ejabber."
+ ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
+ ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
+ ewarn "Please check your configuration."
fi
}
next reply other threads:[~2021-12-12 18:56 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-12 18:56 Florian Schmaus [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-05 20:42 [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/ Sam James
2024-06-10 20:05 Arthur Zamarin
2024-04-16 14:55 Florian Schmaus
2024-04-16 14:50 Florian Schmaus
2024-03-12 19:31 Florian Schmaus
2024-03-10 20:10 Florian Schmaus
2023-12-11 15:44 Florian Schmaus
2023-12-10 10:53 Florian Schmaus
2023-12-06 21:20 Arthur Zamarin
2023-07-30 17:22 Florian Schmaus
2023-07-29 20:20 Florian Schmaus
2023-07-28 18:56 Sam James
2023-07-28 14:28 Florian Schmaus
2023-02-10 20:36 Sam James
2023-02-10 12:40 Florian Schmaus
2022-09-21 19:56 Florian Schmaus
2022-07-16 14:46 Florian Schmaus
2022-07-05 8:52 Agostino Sarubbo
2022-05-17 20:02 Florian Schmaus
2022-03-23 8:33 Florian Schmaus
2022-03-23 8:33 Florian Schmaus
2022-03-23 8:33 Florian Schmaus
2022-02-01 7:22 Hanno Böck
2022-01-20 20:10 Florian Schmaus
2021-12-10 9:26 Florian Schmaus
2021-12-07 10:42 Florian Schmaus
2021-07-30 23:31 Sam James
2021-07-08 18:37 Florian Schmaus
2021-07-08 15:37 Florian Schmaus
2021-06-02 1:13 Sam James
2021-06-01 9:35 Sam James
2021-06-01 9:35 Sam James
2021-05-16 13:49 Sergei Trofimovich
2021-03-07 11:58 David Seifert
2020-10-14 16:20 Hanno Böck
2020-08-23 8:24 Sergei Trofimovich
2020-08-23 8:12 Hanno Böck
2020-08-06 11:52 Agostino Sarubbo
2020-08-06 11:47 Agostino Sarubbo
2020-07-20 11:52 Sam James
2020-07-19 13:33 Sergei Trofimovich
2020-07-17 11:01 Sam James
2020-07-12 8:08 Sergei Trofimovich
2020-07-12 2:41 Sam James
2020-05-04 18:54 Hanno Böck
2020-05-04 11:55 Hanno Böck
2019-07-13 10:10 Amadeusz Piotr Żołnowski
2018-12-04 22:01 Amadeusz Piotr Żołnowski
2018-05-27 15:33 Mikle Kolyada
2018-05-27 14:14 Thomas Deutschmann
2018-04-18 18:11 Pacho Ramos
2018-03-28 19:01 Pacho Ramos
2018-03-26 18:40 Aaron Bauman
2017-12-06 22:18 Amadeusz Piotr Żołnowski
2017-07-09 20:17 Amadeusz Piotr Żołnowski
2017-07-09 20:14 Amadeusz Piotr Żołnowski
2017-05-28 18:06 Amadeusz Piotr Żołnowski
2017-05-27 20:55 Amadeusz Piotr Żołnowski
2017-05-27 20:55 Amadeusz Piotr Żołnowski
2017-05-17 20:34 Amadeusz Piotr Żołnowski
2017-04-19 20:10 Amadeusz Piotr Żołnowski
2017-01-02 9:35 Amadeusz Piotr Żołnowski
2017-01-01 21:49 Agostino Sarubbo
2016-12-23 7:48 Aaron Bauman
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:27 Amadeusz Piotr Żołnowski
2016-08-27 13:12 Amadeusz Piotr Żołnowski
2016-08-27 13:12 Amadeusz Piotr Żołnowski
2016-08-27 7:05 Amadeusz Piotr Żołnowski
2016-08-21 10:49 Amadeusz Piotr Żołnowski
2016-08-20 22:22 Anthony G. Basile
2016-08-20 3:18 Matthias Maier
2016-08-19 20:23 Amadeusz Piotr Żołnowski
2016-07-13 20:36 Amadeusz Piotr Żołnowski
2016-07-09 9:33 Amadeusz Piotr Żołnowski
2016-07-03 17:39 Amadeusz Piotr Żołnowski
2016-07-03 7:44 Amadeusz Piotr Żołnowski
2016-06-14 19:21 Amadeusz Piotr Żołnowski
2016-06-13 21:36 Amadeusz Piotr Żołnowski
2016-06-07 21:35 Amadeusz Piotr Żołnowski
2016-05-05 9:53 Anthony G. Basile
2016-01-24 10:47 Amadeusz Piotr Żołnowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1639335331.87e27f70f0f39184b56b15971dce58e7acdd2bd6.flow@gentoo \
--to=flow@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox