Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30d091f0e1e5e8df391b176c598ccce5f0f87a21
commit 30d091f0e1e5e8df391b176c598ccce5f0f87a21 Author: James Buren <[email protected]> Date: Mon Jul 30 10:02:17 2012 -0500 munin-1.2.6-7-x86_64 * remove permission fixing from install scriptlet * fix permissions in build now diff --git a/source/network-extra/munin/FrugalBuild b/source/network-extra/munin/FrugalBuild index e22f97a..84befa9 100644 --- a/source/network-extra/munin/FrugalBuild +++ b/source/network-extra/munin/FrugalBuild @@ -4,7 +4,7 @@ pkgname=munin pkgver=1.2.6 -pkgrel=6 +pkgrel=7 pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface." Finclude sourceforge url="http://munin.projects.linpro.no/"; @@ -14,10 +14,10 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url|grep 'Stable'|sed 's/.*: \(.*\)\ .*D.*/\1/'" source=(${source/$pkgname-/${pkgname}_} Makefile.config munin.cron munin.logrotate README.Frugalware) sha1sums=('bdc6d1767df1ea618071d76f0c4525dda2ea33d9' \ - '1ef1cef662f90e0177a67655afb020bf856235b8' \ - '876dfcb7c1690be14611db4e9d55b9b40cedac88' \ - 'a1ce31369c2278c1f53509178856341f9a9f6cc6' \ - '264321148f314a2d28a71b688f414e933a0dee03') + '1ef1cef662f90e0177a67655afb020bf856235b8' \ + '876dfcb7c1690be14611db4e9d55b9b40cedac88' \ + 'a1ce31369c2278c1f53509178856341f9a9f6cc6' \ + '264321148f314a2d28a71b688f414e933a0dee03') options=('scriptlet') backup=('etc/munin/munin.conf') removes=('usr/lib/perl5/site_perl/current/Munin.pm') @@ -47,6 +47,9 @@ build() cat > $Fdestdir/etc/tmpfiles.d/munin.conf << EOF d $Flocalstatedir/run/munin 0755 munin munin - EOF + Fdirschown /var/log/munin 47 47 + Fdirschown /var/lib/munin 47 47 + Fdirschown /var/www/html/munin 47 47 } # optimization OK diff --git a/source/network-extra/munin/munin.install b/source/network-extra/munin/munin.install index 9b5e07b..0de7887 100644 --- a/source/network-extra/munin/munin.install +++ b/source/network-extra/munin/munin.install @@ -6,12 +6,6 @@ post_install() if ! grep -q '^munin:' /etc/passwd ; then useradd -u 47 -g 47 -s /bin/false -c "Munin User" -d /var/lib/munin munin fi - - # permissions - chown -R munin:munin /var/www/html/munin - chown -R munin:munin /var/log/munin - chown -R munin:munin /var/lib/munin - chown -R munin:munin /var/run/munin } post_remove() @@ -33,15 +27,6 @@ post_remove() rm -f /var/log/munin/munin-nagios.log* } -post_upgrade() -{ - # permissions - chown -R munin:munin /var/www/html/munin - chown -R munin:munin /var/log/munin - chown -R munin:munin /var/lib/munin - chown -R munin:munin /var/run/munin -} - op=$1 shift $op $* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
