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

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index c300b0ac4ae0b29514afe754951452e46a125f40..7a0f643d09ca945926e2862e48ec85f10eac7419 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -773,7 +773,7 @@ sub updatehwtempgraph {
                "-w 600",
                "-h 125",
                "-r",
-               "-t ".$Lang::tr{'sensors temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
+               "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period},
                "--color=SHADEA".$color{"color19"},
                "--color=SHADEB".$color{"color19"},
                "--color=BACK".$color{"color21"},

diff --git a/config/rootfiles/core/44/exclude b/config/rootfiles/core/44/exclude
index c2bceb8667ae1e9883e4ebfc2e35cef4f7e3a9ee..62dd4f4f0a4ded45f9dc132b602ff0f51ba3dfbd 100644 (file)
--- a/config/rootfiles/core/44/exclude
+++ b/config/rootfiles/core/44/exclude
@@ -4,3 +4,4 @@ etc/ipsec.secrets
 etc/ipsec.user.conf
 etc/ipsec.user.secrets
 var/updatecache
+etc/snort/snort.conf

diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files
index 68c86ba5409469a1aa8ff799923cc2aa9b47a09f..c069ea0f4a5288c6c6b388548184bad068239118 100644 (file)
--- a/config/rootfiles/core/44/filelists/files
+++ b/config/rootfiles/core/44/filelists/files
@@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/html/images/urlfilter/copy.gif
 var/ipfire/general-functions.pl
+var/ipfire/graphs.pl
 var/ipfire/extrahd/bin/extrahd.pl
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl