From 96d64eaf1feb8c7125b2a448a20fba66d7829240 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 24 May 2009 18:07:41 +0200
Subject: [PATCH] Update cacti: backupinclude, rootfile, lfs

---
 config/backup/includes/cacti    | 3 +--
 config/rootfiles/packages/cacti | 9 ++++++---
 lfs/cacti                       | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/backup/includes/cacti b/config/backup/includes/cacti
index b4268f8c88..fc3ff672fa 100644
--- a/config/backup/includes/cacti
+++ b/config/backup/includes/cacti
@@ -1,2 +1 @@
-/usr/share/cacti/rra/
-
+/var/cacti/
diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti
index d89eac0b00..ba88316b58 100644
--- a/config/rootfiles/packages/cacti
+++ b/config/rootfiles/packages/cacti
@@ -444,8 +444,6 @@ usr/share/cacti/lib/utility.php
 usr/share/cacti/lib/variables.php
 usr/share/cacti/lib/xml.php
 usr/share/cacti/log
-var/cacti/log/.htaccess
-var/cacti/log/cacti.log
 usr/share/cacti/logout.php
 usr/share/cacti/poller.php
 usr/share/cacti/poller_commands.php
@@ -467,7 +465,6 @@ usr/share/cacti/resource/snmp_queries/netware_cpu.xml
 usr/share/cacti/resource/snmp_queries/netware_disk.xml
 usr/share/cacti/rra
 usr/share/cacti/rra.php
-var/cacti/rra/.placeholder
 usr/share/cacti/script_server.php
 usr/share/cacti/script_server.pl
 #usr/share/cacti/scripts
@@ -497,4 +494,10 @@ usr/share/cacti/templates_import.php
 usr/share/cacti/tree.php
 usr/share/cacti/user_admin.php
 usr/share/cacti/utilities.php
+#var/cacti
+#var/cacti/log
+var/cacti/log/.htaccess
+var/cacti/log/cacti.log
+#var/cacti/rra
+var/cacti/rra/.placeholder
 var/ipfire/backup/addons/includes/cacti
diff --git a/lfs/cacti b/lfs/cacti
index 5d5179a1a8..0206059ca4 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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 /usr/share/cacti/rra/ /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)
-- 
2.39.2