[arch-commits] Commit in cacti/trunk (PKGBUILD cacti.install)

[Sergej Pupykin]

    Date: Monday, March 24, 2014 @ 10:04:23
  Author: spupykin
Revision: 108172

upgpkg: cacti 0.8.8_b-4

upd

Modified:
  cacti/trunk/PKGBUILD
  cacti/trunk/cacti.install

---------------+
 PKGBUILD      |   12 ++++++++++--
 cacti.install |    6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-24 08:30:46 UTC (rev 108171)
+++ PKGBUILD	2014-03-24 09:04:23 UTC (rev 108172)
@@ -4,7 +4,7 @@
 
 pkgname=cacti
 pkgver=0.8.8_b
-pkgrel=3
+pkgrel=4
 pkgdesc="complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality"
 arch=(any)
 url="http://www.cacti.net"
@@ -25,8 +25,16 @@
 package() {
   mkdir -p $pkgdir/usr/share/webapps/cacti $pkgdir/etc/webapps/cacti
   mv $srcdir/$pkgname-${pkgver/_/}/* $pkgdir/usr/share/webapps/cacti
-  echo "deny from all" >> $pkgdir/etc/webapps/cacti/.htaccess
+  echo "Require all denied" >> $pkgdir/etc/webapps/cacti/.htaccess
   mv $pkgdir/usr/share/webapps/cacti/include/config.php $pkgdir/etc/webapps/cacti
   ln -s /etc/webapps/cacti/.htaccess $pkgdir/usr/share/webapps/cacti/.htaccess
   ln -s /etc/webapps/cacti/config.php $pkgdir/usr/share/webapps/cacti/include/config.php
+
+  install -dm0755 $pkgdir/var/log/ $pkgdir/var/lib/cacti/
+
+  mv $pkgdir/usr/share/webapps/cacti/rra $pkgdir/var/lib/cacti/rra
+  ln -s /var/lib/cacti/rra $pkgdir/usr/share/webapps/cacti/rra
+
+  mv $pkgdir/usr/share/webapps/cacti/log $pkgdir/var/log/cacti
+  ln -s /var/log/cacti $pkgdir/usr/share/webapps/cacti/log
 }

Modified: cacti.install
===================================================================
--- cacti.install	2014-03-24 08:30:46 UTC (rev 108171)
+++ cacti.install	2014-03-24 09:04:23 UTC (rev 108172)
@@ -1,3 +1,7 @@
 post_upgrade() {
-  echo "NOTE: since 0.8.8_a-2 cacti is in /usr/share/webapps/"
+  post_install
 }
+
+post_install() {
+  chown -R http:http var/log/cacti var/lib/cacti/rra
+}