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

Changed pakfire logging facility to syslog and added to core12

Browse Source
This commit is contained in:
Christian Schmidt
2008-04-18 15:07:45 +02:00
parent 8480a8d7b7
commit c506cad0de
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/core/12/files
View File

@@ -134,4 +134,7 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/dm9601.ko
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
opt/pakfire/lib/functions.pl
var/ipfire/langs

6
html/cgi-bin/logs.cgi/log.dat
View File

@@ -65,7 +65,8 @@ my %sections = (
'auth' => '(\w+\(pam_unix\)\[.*\]: )',
'kernel' => '(kernel: (?!DROP_))',
'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |vpnwatch: )',
'openvpn' => '(openvpnserver)\[.*\]: '
'openvpn' => '(openvpnserver)\[.*\]: ',
'pakfire' => '(pakfire:) '
);
# Translations for the %sections array.
@@ -76,13 +77,14 @@ my %trsections = (
'dhcp' => "$Lang::tr{'dhcp server'}",
'cron' => 'Cron',
'collectd' => 'Collectd',
'clamav' => 'ClamAV',
'clamav' => 'ClamAV',
'ntp' => 'NTP',
'ssh' => 'SSH',
'auth' => "$Lang::tr{'loginlogout'}",
'kernel' => "$Lang::tr{'kernel'}",
'ipsec' => 'IPSec',
'openvpn' => 'OpenVPN',
'pakfire' => 'Pakfire',
);

6
html/cgi-bin/pakfire.cgi
View File

@@ -61,7 +61,6 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
if ("$pakfiresettings{'FORCE'}" eq "on") {
my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
system("$command");
sleep(2);
} else {
&Header::openbox("100%", "center", "Abfrage");
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
@@ -101,7 +100,6 @@ END
if ("$pakfiresettings{'FORCE'}" eq "on") {
my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
system("$command");
sleep(2);
} else {
&Header::openbox("100%", "center", "Abfrage");
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
@@ -141,8 +139,8 @@ END
system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null");
} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
system("/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null");
my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null";
system("$command");
refreshpage();
} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {

4
src/pakfire/lib/functions.pl
View File

@@ -93,8 +93,8 @@ sub message {
sub logger {
my $log = shift;
if ($log) {
system("echo \"`date`: $log\" >> /var/log/pakfire.log");
#system("logger -t pakfire \"$log\"");
#system("echo \"`date`: $log\" >> /var/log/pakfire.log");
system("logger -t pakfire \"$log\"");
}
}