From: Peter Pfeiffer <peterman@ipfire.org>
Date: Mon, 18 May 2009 08:56:09 +0000 (+0200)
Subject: minor fixes for Cacti
X-Git-Tag: v2.5-beta3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cada85c17563d751230cb7cc88d92fde1d7682d;p=people%2Fms%2Fipfire-2.x.git

minor fixes for Cacti
---

diff --git a/lfs/cacti b/lfs/cacti
index 45c1f65db9..399f21d316 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -82,8 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir /usr/share/cacti
 	cd $(DIR_APP) && mv -vf * /usr/share/cacti
 	cp -vf $(DIR_SRC)/config/cacti/cacti.conf /etc/httpd/conf/vhosts.d/
-	install -v -m755 $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/cacti.cron
+	install -v -m 755 $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/cacti.cron
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/cacti \
 	                 /var/ipfire/backup/addons/includes/cacti
+	chown -R nobody:nobody usr/share/cacti/rrd/ /usr/share/cacti/log/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/paks/cacti/install.sh b/src/paks/cacti/install.sh
index 2c05f64d8b..c6b354c864 100644
--- a/src/paks/cacti/install.sh
+++ b/src/paks/cacti/install.sh
@@ -26,4 +26,4 @@ extract_files
 mysqladmin --user=root -pmysqlfire create cacti
 mysql --user=root -pmysqlfire cacti < /usr/share/cacti/cacti.sql
 mysql --user=root -pmysqlfire -e "GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'cactiuser';" mysql
-/etc init.d/apache restart
+/etc/init.d/apache restart