Date: Friday, July 10, 2020 @ 06:43:17 Author: arojas Revision: 391523
Update to 2.0.64, move directory ownership changes to tmpfiles (FS#67238) Added: munin/trunk/munin.tmpfiles (from rev 391522, munin/trunk/munin.tmpfiles.conf) Modified: munin/trunk/PKGBUILD munin/trunk/munin-node.install munin/trunk/munin.install Deleted: munin/trunk/munin.tmpfiles.conf ---------------------+ PKGBUILD | 14 +++++++------- munin-node.install | 10 ---------- munin.install | 5 ----- munin.tmpfiles | 5 +++++ munin.tmpfiles.conf | 1 - 5 files changed, 12 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-10 06:21:28 UTC (rev 391522) +++ PKGBUILD 2020-07-10 06:43:17 UTC (rev 391523) @@ -3,8 +3,8 @@ pkgname=('munin' 'munin-node') pkgbase=munin -pkgver=2.0.63 -pkgrel=2 +pkgver=2.0.64 +pkgrel=1 pkgdesc="A distributed monitoring/graphing tool" arch=('any') url="http://munin-monitoring.org/" @@ -18,7 +18,7 @@ munin-cron-entry logrotate.munin logrotate.munin-node - munin.tmpfiles.conf + munin.tmpfiles munin-node.service munin-async.service munin-graph.{service,socket} @@ -51,7 +51,7 @@ PERL5LIB=. make DESTDIR="$pkgdir" install-master-prime install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin - install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin.conf + install -D -m644 ../munin.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/munin.conf install -D -m644 ../munin-graph.service "$pkgdir"/usr/lib/systemd/system/munin-graph.service install -D -m644 ../munin-graph.socket "$pkgdir"/usr/lib/systemd/system/munin-graph.socket install -D -m644 ../munin-html.service "$pkgdir"/usr/lib/systemd/system/munin-html.service @@ -74,7 +74,7 @@ cd "$srcdir/munin-$pkgver" PERL5LIB=. make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime install-async-prime install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node - install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf + install -D -m644 ../munin.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf install -D -m644 ../munin-node.service "$pkgdir"/usr/lib/systemd/system/munin-node.service install -D -m644 ../munin-async.service "$pkgdir"/usr/lib/systemd/system/munin-async.service install -D -m644 ../munin.sysusers "$pkgdir"/usr/lib/sysusers.d/munin-node.conf @@ -82,12 +82,12 @@ chmod 775 "$pkgdir/var/lib/munin/plugin-state" } -md5sums=('c94430a387624971087fe4cf6814409c' +md5sums=('d6c61792b90302a1f059c00b542b5280' 'ddd12ed7e02015fee9cb00c9afc3e837' 'dc9c83aa2a278466fb475364462f4119' 'eb2f1e6e746e85ce1e91111f40086be0' 'cdf139f2b6ae36852113f3411caa6e99' - 'd124f46e353a7966df093ba803235789' + '5c5609304669942f1a994706c6e1a121' '80afc4a85e2e87d8f1acf7a56d86a37f' 'a79180838bc6ecc1a6350b451b9c104f' '7794398d9220d94b824e1b9fe4610795' Modified: munin-node.install =================================================================== --- munin-node.install 2020-07-10 06:21:28 UTC (rev 391522) +++ munin-node.install 2020-07-10 06:43:17 UTC (rev 391523) @@ -2,14 +2,4 @@ # Do basic configuration echo "==> Run the following to get a good set of default plugins:" echo " munin-node-configure --shell | sh" - post_upgrade } - -post_upgrade() { - # Ensure directories exist - mkdir -p /var/{lib,log}/munin /run/munin - # Fix permissions on necessary directories - chown munin:munin /var/{lib,log}/munin /run/munin - chown munin:munin /var/lib/munin/spool - chown munin:munin /var/lib/munin/plugin-state -} Modified: munin.install =================================================================== --- munin.install 2020-07-10 06:21:28 UTC (rev 391522) +++ munin.install 2020-07-10 06:43:17 UTC (rev 391523) @@ -6,11 +6,6 @@ } post_upgrade() { - # Ensure directories exist - mkdir -p /var/{lib,log}/munin /run/munin - # Fix permissions on necessary directories - chown munin:munin /var/{lib,log}/munin /run/munin - chown munin:munin /var/lib/munin/spool fc-cache /usr/lib/munin } Copied: munin/trunk/munin.tmpfiles (from rev 391522, munin/trunk/munin.tmpfiles.conf) =================================================================== --- munin.tmpfiles (rev 0) +++ munin.tmpfiles 2020-07-10 06:43:17 UTC (rev 391523) @@ -0,0 +1,5 @@ +d /run/munin 0755 munin munin - +d /var/lib/munin 0755 munin munin - +d /var/lib/munin/spool 0755 munin munin - +d /var/lib/munin/plugin-state 0755 munin munin - +d /var/log/munin 0755 munin munin - Deleted: munin.tmpfiles.conf =================================================================== --- munin.tmpfiles.conf 2020-07-10 06:21:28 UTC (rev 391522) +++ munin.tmpfiles.conf 2020-07-10 06:43:17 UTC (rev 391523) @@ -1 +0,0 @@ -d /run/munin 0755 munin munin -