Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti
index d72937a14cbabb41d6d65e56b8fe935c92465846..d89eac0b00e6015861191cd57bac0820d80a5409 100644 (file)
--- a/config/rootfiles/packages/cacti
+++ b/config/rootfiles/packages/cacti
@@ -443,9 +443,9 @@ usr/share/cacti/lib/tree.php
 usr/share/cacti/lib/utility.php
 usr/share/cacti/lib/variables.php
 usr/share/cacti/lib/xml.php
-#usr/share/cacti/log
-usr/share/cacti/log/.htaccess
-usr/share/cacti/log/cacti.log
+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
@@ -465,9 +465,9 @@ usr/share/cacti/resource/snmp_queries/kbridge.xml
 usr/share/cacti/resource/snmp_queries/net-snmp_disk.xml
 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
 usr/share/cacti/rra.php
-usr/share/cacti/rra/.placeholder
+var/cacti/rra/.placeholder
 usr/share/cacti/script_server.php
 usr/share/cacti/script_server.pl
 #usr/share/cacti/scripts

diff --git a/lfs/cacti b/lfs/cacti
index 325c7e788b006f35eaba9c67bdbf0c7f046e712c..5d5179a1a8dc66db6320187b930b7cb8913155fb 100644 (file)
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -85,6 +85,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+       mkdir /var/cacti && mkdir /var/cacti/rra && mkdir /var/cacti/log 
+       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/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)