webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deleted old Loadstat file, fixed logrotate warning, hwgraphs ignoring special characters, upgrade includes cgis by apache, made paralellism flag by config

Browse Source
This commit is contained in:
Maniacikarus
2008-10-27 22:13:53 +01:00
parent 5e932bd569
commit e4e74858e4
6 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/cron/minutely/loadstat
View File

@@ -1,13 +0,0 @@
#!/usr/bin/perl
use RRDs;
my $LOAD = '';
my $CMD = "awk '{print \$1\":\"\$2\":\"\$3}' < /proc/loadavg";
$LOAD=`$CMD`;
chomp($LOAD);
RRDs::update ("/var/log/rrd/load.rrd",
"-t", "load1:load5:load15",
"N:$LOAD");
my $ERROR = RRDs::error;
print "$ERROR\n" if $ERROR;

2
config/etc/logrotate.conf
View File

@@ -65,7 +65,7 @@ compress
endscript
}
/var/log/messages /var/log/boot.log /var/log/dhcpcd.log {
/var/log/messages /var/log/bootlog /var/log/dhcpcd.log {
create 664 root syslogd
sharedscripts
ifempty

1
config/rootfiles/common/fcron
View File

@@ -5,7 +5,6 @@ etc/fcron.daily
etc/fcron.deny
etc/fcron.hourly
etc/fcron.minutely
#etc/fcron.minutely/loadstat
etc/fcron.monthly
etc/fcron.weekly
usr/bin/fcronsighup

20
config/rootfiles/updater/filelists/files
View File

@@ -1,4 +1,5 @@
opt/pakfire/db/core/mine
etc/logrotate.conf
etc/rc.d/init.d/mISDN
etc/modprobe.d/blacklist
usr/bin/bc
@@ -26,24 +27,6 @@ usr/local/bin/makegraphs
usr/local/bin/hddshutdown
usr/local/bin/squidctrl
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/webaccess.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ddns.cgi
var/ipfire/backup/bin/backup.pl
var/ipfire/sensors/
var/ipfire/menu.d/20-status.menu
@@ -52,7 +35,6 @@ var/ipfire/firebuild
var/ipfire/qos/bin/makeqosscripts.pl
var/ipfire/proxy/advanced/useragents
srv/web/ipfire/html/images/updbooster/
srv/web/ipfire/cgi-bin/updatexlrator.cgi
var/ipfire/updatexlrator/bin/
usr/sbin/updxlrator
var/ipfire/langs

34
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -83,8 +83,12 @@ if ( $querry[0] =~ "hwtemp"){
chomp($_);
$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
my $label = $2.$3;$label=~ s/-//g;
if ( $sensorsettings{'LINE-'.$label} ne "on" ){$sensorsettings{'LINE-'.$label} = 'off';}
elsif ( $sensorsettings{'LINE-'.$label} eq "on" ){$sensorsettings{'LINE-'.$label} = 'checked';}
if ( $sensorsettings{'LINE-'.$label} ne "on" ){
$sensorsettings{'LINE-'.$label} = 'off';
} elsif ($sensorsettings{'LINE-'.$label} eq "on" ){
$sensorsettings{'LINE-'.$label} = 'checked';
}
$sensorsettings{'LABEL-'.$label} =~ s/\W//g;
}
&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
}
@@ -102,31 +106,31 @@ if ( $querry[0] =~ "hwtemp"){
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone*` ) {
&Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day");
&Header::closebox();
&Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day");
&Header::closebox();
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/temperature-*` ) {
&Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day");
&Header::closebox();
&Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day");
Header::closebox();
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/fanspeed-*` ) {
&Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day");
&Header::closebox();
&Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day");
&Header::closebox();
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/voltage-*` ) {
&Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","375");
&Header::closebox();
&Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","375");
&Header::closebox();
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*` ) {
sensorsbox();
sensorsbox();
}
&Header::closebigbox();
&Header::closepage();

6
make.sh
View File

@@ -177,7 +177,9 @@ prepareenv() {
# Setup environment
set +h
LC_ALL=POSIX
MAKETUNING="-j6"
if [ -z $MAKETUNING ]; then
MAKETUNING="-j6"
fi
export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
@@ -350,7 +352,7 @@ buildipfire() {
ipfiremake gdbm
ipfiremake gmp
ipfiremake pam
ipfiremake openssl PADLOCK=1
ipfiremake openssl
ipfiremake curl
ipfiremake python
ipfiremake libnet