webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-06-28 00:49:44 +02:00
parent 5532265c3c ad8cad552b
commit b751ad8181
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/cfgroot/graphs.pl
View File

@@ -257,11 +257,11 @@ sub updateloadgraph {
"DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
"DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE",
"DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE",
"AREA:load1".$color{"color13"}."A0:1 Minute:", "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":",
"GPRINT:load1:LAST:%5.2lf", "GPRINT:load1:LAST:%5.2lf",
"AREA:load5".$color{"color18"}."A0:5 Minuten:", "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
"GPRINT:load5:LAST:%5.2lf", "GPRINT:load5:LAST:%5.2lf",
"AREA:load15".$color{"color14"}."A0:15 Minuten:", "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
"GPRINT:load15:LAST:%5.2lf\\j", "GPRINT:load15:LAST:%5.2lf\\j",
"LINE1:load5".$color{"color13"}, "LINE1:load5".$color{"color13"},
"LINE1:load1".$color{"color18"}, "LINE1:load1".$color{"color18"},

1
config/rootfiles/core/50/filelists/files
View File

@@ -2,3 +2,4 @@ etc/system-release
var/ipfire/langs/ var/ipfire/langs/
etc/rc.d/init.d/console etc/rc.d/init.d/console
usr/local/sbin/setup usr/local/sbin/setup
var/ipfire/graphs.pl

1
config/rootfiles/core/50/filelists/smartmontools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/smartmontools

1
langs/de/cgi-bin/de.pl
View File

@@ -1159,6 +1159,7 @@
'min delay' => 'Minimale Verzögerung', 'min delay' => 'Minimale Verzögerung',
'min size' => 'Min. Objektgröße (kB):', 'min size' => 'Min. Objektgröße (kB):',
'minimal' => 'Minimal', 'minimal' => 'Minimal',
'minute' => 'Minute',
'minutes' => 'Minuten', 'minutes' => 'Minuten',
'misc-options' => 'Sonstige Optionen', 'misc-options' => 'Sonstige Optionen',
'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden',

1
langs/en/cgi-bin/en.pl
View File

@@ -1186,6 +1186,7 @@
'min delay' => 'Minimum delay', 'min delay' => 'Minimum delay',
'min size' => 'Min object size (KB):', 'min size' => 'Min object size (KB):',
'minimal' => 'Minimal', 'minimal' => 'Minimal',
'minute' => 'Minute',
'minutes' => 'Minutes', 'minutes' => 'Minutes',
'misc-options' => 'Miscellaneous options', 'misc-options' => 'Miscellaneous options',
'missing dat' => 'Encrypted archive not found', 'missing dat' => 'Encrypted archive not found',

6
lfs/smartmontools
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config include Config
VER = 5.40 VER = 5.41
THISAPP = smartmontools-$(VER) THISAPP = smartmontools-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b $(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692
install : $(TARGET) install : $(TARGET)