X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcacti;h=9862cfeb1744141d467026f829888f811dd7a5e2;hp=639dcf265a672bd588c5458e080b30baabc69e73;hb=9f6e5c768ee27f986b303f91dd42d07bc0ce4c56;hpb=fb26467bb390ba85c09f4af1fb16422ef7d800dc

diff --git a/lfs/cacti b/lfs/cacti
index 639dcf265a..9862cfeb17 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.7d
+VER        = 0.8.7e
 
 THISAPP    = cacti-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cacti
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = "net-snmp mysql"
+DEPS       = "netsnmpd mysql"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0822068bfa547278e94d3143ef9279e0
+$(DL_FILE)_MD5 = 7563a58a57d2c6cc0da28cc341a30969
 
 install : $(TARGET)
 
@@ -78,15 +78,20 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	@rm -rf /usr/share/cacti
-	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/	
-	cp -vf $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/	
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
-
-
+	@rm -rf /var/cacti /usr/share/cacti
+	mkdir -pv /var/cacti /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 -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
 
+	mv -vf /usr/share/cacti/log /var/cacti
+	mv -vf /usr/share/cacti/rra /var/cacti
+	ln -s /var/cacti/log /usr/share/cacti/log
+	ln -s /var/cacti/rra /usr/share/cacti/rra
 
+	chown -R nobody:nobody /var/cacti/rra /var/cacti/log
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)