Update cacti: backupinclude, rootfile, lfs

diff --git a/config/backup/includes/cacti b/config/backup/includes/cacti
index b4268f8c88d10560f436cf971bad7c86a44428d4..fc3ff672fade8d6cdfd526b1614d1968242f98f2 100644 (file)
--- 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 d89eac0b00e6015861191cd57bac0820d80a5409..ba88316b5805d4b4fd54da8275ca474e628ce02e 100644 (file)
--- 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 5d5179a1a8dc66db6320187b930b7cb8913155fb..0206059ca42ef42b7e7886d2417d61801c54eea3 100644 (file)
--- 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)