Date: Monday, February 5, 2018 @ 16:41:14 Author: eschwartz Revision: 289258
migrate to systemd-sysusers/systemd-tmpfiles Added: rabbitmq/trunk/rabbitmq.sysusers rabbitmq/trunk/rabbitmq.tmpfiles Modified: rabbitmq/trunk/PKGBUILD rabbitmq/trunk/rabbitmq.install -------------------+ PKGBUILD | 11 ++++++----- rabbitmq.install | 6 ------ rabbitmq.sysusers | 1 + rabbitmq.tmpfiles | 2 ++ 4 files changed, 9 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-05 16:37:52 UTC (rev 289257) +++ PKGBUILD 2018-02-05 16:41:14 UTC (rev 289258) @@ -21,11 +21,15 @@ source=(https://www.rabbitmq.com/releases/${pkgname}-server/v${pkgver}/${pkgname}-server-generic-unix-${pkgver}.tar.xz{,.asc} rabbitmq-env.conf rabbitmq.service + rabbitmq.sysusers + rabbitmq.tmpfiles rabbitmq-script-wrapper) sha512sums=('842a30d14f78f42fe765936d9ad38612cf90c4ec5b09f52d3fb06ad4eec0eddf54244cfc43086b9949eee39dc37b7d4bc12c5ffb4339efd717b45322b3dc5784' 'SKIP' '4872ff514c9f841fe4c93bc442ec4e3177d1bfa3834e8d8a26fc77a63aff1cdc14944827673a59556e26210b2b4c0091f93c8e93a334710e5bc3336a64e77140' 'd51b43f948febb23cdd5b0c7736f966d8433b05ccd95778e90d280d45ccfd9a714e888762f458337a784fff4b86430151adb0f81d779d6b99c9154fcd7e0e319' + '17d33e7104172bc265d97821fec58f1402ad3103f1ea4b1f6bbabcf0dd840685708a1bdc808b48c1a60726c5c0aa7b6479395afd9360d3116b812c143c432423' + '5cbef5497029ff227050c6f18c4fcc35b3922747408d01b7590f096253af82a8a8f16008efcc8ea21f970ce87244de62e2e375f65c49e407e53440eada5d7114' '3f271d546836eccc3bcf61105c013d3b590c3e2535106d07e5605a63174fd62ef204207367c2cd39be54e0246d0bbd9aecebe8b5cefe9018a766ceb8af70bc81') validpgpkeys=('0A9AF2115F4687BD29803A206B73A36E6026DFCA') # RabbitMQ Release Signing Key <[email protected]> @@ -40,8 +44,6 @@ install -d "${libdir}" install -d "${pkgdir}/usr/bin" - install -dm 750 "${pkgdir}/var/log/rabbitmq" - install -dm 750 "${pkgdir}/var/lib/rabbitmq" cp -R ebin "${libdir}" cp -R include "${libdir}" @@ -49,7 +51,6 @@ cp -R sbin "${libdir}" cp -R share "${pkgdir}/usr" - install -d "${pkgdir}/usr/lib/rabbitmq/bin" install -Dm 755 "${srcdir}/rabbitmq-script-wrapper" -t "${pkgdir}/usr/lib/rabbitmq/bin" for script in "${libdir}"/sbin/*; do ln -s "${script#${pkgdir}}" "${pkgdir}/usr/lib/rabbitmq/bin" @@ -58,9 +59,9 @@ install -Dm 644 "${srcdir}/rabbitmq-env.conf" "${pkgdir}/etc/rabbitmq/rabbitmq-env.conf" install -Dm 644 "${srcdir}/rabbitmq.service" "${pkgdir}/usr/lib/systemd/system/rabbitmq.service" + install -Dm 644 "${srcdir}/rabbitmq.sysusers" "${pkgdir}/usr/lib/sysusers.d/rabbitmq.conf" + install -Dm 644 "${srcdir}/rabbitmq.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/rabbitmq.conf" - chown -R 197:197 "${pkgdir}/var/log/rabbitmq" - chown -R 197:197 "${pkgdir}/var/lib/rabbitmq" chown -R 197:0 "${pkgdir}/etc/rabbitmq" } Modified: rabbitmq.install =================================================================== --- rabbitmq.install 2018-02-05 16:37:52 UTC (rev 289257) +++ rabbitmq.install 2018-02-05 16:41:14 UTC (rev 289258) @@ -1,15 +1,9 @@ post_install() { - if ! getent passwd rabbitmq &>/dev/null; then - groupadd -r -g 197 rabbitmq &>/dev/null - useradd -r -u 197 -g rabbitmq -d /var/lib/rabbitmq -s /bin/nologin -c 'RabbitMQ user' rabbitmq &>/dev/null - passwd -l rabbitmq &>/dev/null - fi sed -e "/NODENAME/s/rabbit$/rabbit@$(hostname -s)/" -i /etc/rabbitmq/rabbitmq-env.conf } post_upgrade() { post_install - usermod -s /bin/nologin rabbitmq &>/dev/null } # vim: ts=2 sw=2 et: Added: rabbitmq.sysusers =================================================================== --- rabbitmq.sysusers (rev 0) +++ rabbitmq.sysusers 2018-02-05 16:41:14 UTC (rev 289258) @@ -0,0 +1 @@ +u rabbitmq 197 "RabbitMQ user" /var/lib/rabbitmq Added: rabbitmq.tmpfiles =================================================================== --- rabbitmq.tmpfiles (rev 0) +++ rabbitmq.tmpfiles 2018-02-05 16:41:14 UTC (rev 289258) @@ -0,0 +1,2 @@ +d /var/lib/rabbitmq 0750 rabbitmq rabbitmq - - +d /var/log/rabbitmq 0750 rabbitmq rabbitmq - -
