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

diff --git a/config/backup/includes/cacti b/config/backup/includes/cacti
new file mode 100644 (file)
index 0000000..b4268f8
--- /dev/null
+++ b/config/backup/includes/cacti
@@ -0,0 +1,2 @@
+/usr/share/cacti/rra/
+

diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti
index 5115519d6753c94af8f4b142d45fdfc670b5725b..d72937a14cbabb41d6d65e56b8fe935c92465846 100644 (file)
--- a/config/rootfiles/packages/cacti
+++ b/config/rootfiles/packages/cacti
@@ -1,6 +1,6 @@
 etc/fcron.cyclic/cacti.cron
 etc/httpd/conf/vhosts.d/cacti.conf
-usr/share/cacti
+#usr/share/cacti
 #usr/share/cacti/LICENSE
 #usr/share/cacti/README
 usr/share/cacti/about.php
@@ -8,7 +8,7 @@ usr/share/cacti/auth_changepassword.php
 usr/share/cacti/auth_login.php
 usr/share/cacti/cacti.sql
 usr/share/cacti/cdef.php
-usr/share/cacti/cli
+#usr/share/cacti/cli
 usr/share/cacti/cli/.htaccess
 usr/share/cacti/cli/add_data_query.php
 usr/share/cacti/cli/add_device.php
@@ -159,7 +159,7 @@ usr/share/cacti/graphs_items.php
 usr/share/cacti/graphs_new.php
 usr/share/cacti/host.php
 usr/share/cacti/host_templates.php
-usr/share/cacti/images
+#usr/share/cacti/images
 usr/share/cacti/images/arrow.gif
 usr/share/cacti/images/auth_deny.gif
 usr/share/cacti/images/auth_login.gif
@@ -221,7 +221,7 @@ usr/share/cacti/images/tab_mode_tree_down.gif
 usr/share/cacti/images/tab_settings.gif
 usr/share/cacti/images/tab_settings_down.gif
 usr/share/cacti/images/transparent_line.gif
-usr/share/cacti/include
+#usr/share/cacti/include
 usr/share/cacti/include/auth.php
 usr/share/cacti/include/bottom_footer.php
 usr/share/cacti/include/config.php
@@ -230,10 +230,10 @@ usr/share/cacti/include/global_arrays.php
 usr/share/cacti/include/global_constants.php
 usr/share/cacti/include/global_form.php
 usr/share/cacti/include/global_settings.php
-usr/share/cacti/include/jscalendar
+#usr/share/cacti/include/jscalendar
 usr/share/cacti/include/jscalendar/calendar-setup.js
 usr/share/cacti/include/jscalendar/calendar.js
-usr/share/cacti/include/jscalendar/lang
+#usr/share/cacti/include/jscalendar/lang
 usr/share/cacti/include/jscalendar/lang/calendar-af.js
 usr/share/cacti/include/jscalendar/lang/calendar-al.js
 usr/share/cacti/include/jscalendar/lang/calendar-bg.js
@@ -281,7 +281,7 @@ usr/share/cacti/include/layout.js
 usr/share/cacti/include/main.css
 usr/share/cacti/include/top_graph_header.php
 usr/share/cacti/include/top_header.php
-usr/share/cacti/include/treeview
+#usr/share/cacti/include/treeview
 usr/share/cacti/include/treeview/ftiens4.js
 usr/share/cacti/include/treeview/ftiens4_export.js
 usr/share/cacti/include/treeview/ftv2blank.gif
@@ -295,7 +295,7 @@ usr/share/cacti/include/treeview/ftv2vertline.gif
 usr/share/cacti/include/treeview/ua.js
 usr/share/cacti/include/zoom.js
 usr/share/cacti/index.php
-usr/share/cacti/install
+#usr/share/cacti/install
 #usr/share/cacti/install/0_8_1_to_0_8_2.php
 #usr/share/cacti/install/0_8_2_to_0_8_2a.php
 #usr/share/cacti/install/0_8_2a_to_0_8_3.php
@@ -317,8 +317,8 @@ usr/share/cacti/install
 usr/share/cacti/install/index.php
 usr/share/cacti/install/install_finish.gif
 usr/share/cacti/install/install_next.gif
-usr/share/cacti/lib
-usr/share/cacti/lib/adodb
+#usr/share/cacti/lib
+#usr/share/cacti/lib/adodb
 usr/share/cacti/lib/adodb/adodb-csvlib.inc.php
 usr/share/cacti/lib/adodb/adodb-datadict.inc.php
 usr/share/cacti/lib/adodb/adodb-error.inc.php
@@ -333,7 +333,7 @@ usr/share/cacti/lib/adodb/adodb-php4.inc.php
 usr/share/cacti/lib/adodb/adodb-time.inc.php
 usr/share/cacti/lib/adodb/adodb-xmlschema.inc.php
 usr/share/cacti/lib/adodb/adodb.inc.php
-usr/share/cacti/lib/adodb/datadict
+#usr/share/cacti/lib/adodb/datadict
 usr/share/cacti/lib/adodb/datadict/datadict-access.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-db2.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-firebird.inc.php
@@ -346,7 +346,7 @@ usr/share/cacti/lib/adodb/datadict/datadict-oci8.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-postgres.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-sapdb.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-sybase.inc.php
-usr/share/cacti/lib/adodb/drivers
+#usr/share/cacti/lib/adodb/drivers
 usr/share/cacti/lib/adodb/drivers/adodb-access.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-ado.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-ado5.inc.php
@@ -387,7 +387,7 @@ usr/share/cacti/lib/adodb/drivers/adodb-sqlite.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-sqlitepo.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-sybase.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-vfp.inc.php
-usr/share/cacti/lib/adodb/lang
+#usr/share/cacti/lib/adodb/lang
 usr/share/cacti/lib/adodb/lang/adodb-ar.inc.php
 usr/share/cacti/lib/adodb/lang/adodb-bg.inc.php
 usr/share/cacti/lib/adodb/lang/adodb-bgutf8.inc.php
@@ -443,34 +443,34 @@ 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
 usr/share/cacti/log/.htaccess
 usr/share/cacti/log/cacti.log
 usr/share/cacti/logout.php
 usr/share/cacti/poller.php
 usr/share/cacti/poller_commands.php
 usr/share/cacti/poller_export.php
-usr/share/cacti/resource
-usr/share/cacti/resource/script_queries
+#usr/share/cacti/resource
+#usr/share/cacti/resource/script_queries
 usr/share/cacti/resource/script_queries/host_cpu.xml
 usr/share/cacti/resource/script_queries/host_disk.xml
 usr/share/cacti/resource/script_queries/unix_disk.xml
 usr/share/cacti/resource/script_server
 usr/share/cacti/resource/script_server/host_cpu.xml
 usr/share/cacti/resource/script_server/host_disk.xml
-usr/share/cacti/resource/snmp_queries
+#usr/share/cacti/resource/snmp_queries
 usr/share/cacti/resource/snmp_queries/host_disk.xml
 usr/share/cacti/resource/snmp_queries/interface.xml
 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
 usr/share/cacti/script_server.php
 usr/share/cacti/script_server.pl
-usr/share/cacti/scripts
+#usr/share/cacti/scripts
 usr/share/cacti/scripts/3com_cable_modem.pl
 usr/share/cacti/scripts/diskfree.pl
 usr/share/cacti/scripts/diskfree.sh
@@ -497,3 +497,4 @@ usr/share/cacti/templates_import.php
 usr/share/cacti/tree.php
 usr/share/cacti/user_admin.php
 usr/share/cacti/utilities.php
+var/ipfire/backup/addons/includes/cacti

diff --git a/lfs/cacti b/lfs/cacti
index 639dcf265a672bd588c5458e080b30baabc69e73..45c1f65db9f9ce774dc8a330c8fe5a6cb3a01cf1 100644 (file)
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -81,12 +81,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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/    
+       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 644 $(DIR_SRC)/config/backup/includes/cacti \
+                        /var/ipfire/backup/addons/includes/cacti
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-
-
-
-
-

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index abb3a6aa12e2b8a387a16fa229de2b98186f6233..aa5108a77adc2ead80603099b29a35ee2689fec7 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -19,6 +19,12 @@
 
 . /etc/sysconfig/rc 
 . ${rc_functions}
+
+eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
+if [ "$RRDLOG" == "" ]; then
+       RRDLOG=/var/log/rrd
+fi
+
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 TYPE="${RED_TYPE}"
@@ -357,6 +363,9 @@ case "${1}" in
                        ## Create & Enable vnstat
                        /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
                        /etc/rc.d/init.d/connectd start
+                       # Add a NaN value to ppp0 rrd to supress spikes at reconnect
+                       rrdtool $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrf \
+                               $(date +%s)::
                        exit 0
                fi
                ;;
@@ -413,6 +422,9 @@ case "${1}" in
                        rm -f /var/ipfire/red/keepconnected
                        killall -w -s TERM /usr/sbin/pppd 2>/dev/null
                        evaluate_retval
+                       # Add a NaN value to ppp0 rrd to supress spikes at reconnect
+                       rrdtool $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrf \
+                               $(date +%s)::
                fi
 
                if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then