Changed pakfire logging facility to syslog and added to core12

diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files
index bfafdec3ff46bce329c35d681d412407358d619c..2ecf1fdf5f5d4e8ddf4afae34b17968ac5042e8c 100644 (file)
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -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/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
 var/ipfire/langs

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 937a4f882a54f41887a4ecd0bcd99a0996b1cda8..f6f80d1754ef0890db1e00e401034ce2e3f26da7 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -65,7 +65,8 @@ my %sections = (
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
         'kernel' => '(kernel: (?!DROP_))',
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |vpnwatch: )',
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
         'kernel' => '(kernel: (?!DROP_))',
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |vpnwatch: )',

-        'openvpn' => '(openvpnserver)\[.*\]: '
+        'openvpn' => '(openvpnserver)\[.*\]: ',
+        'pakfire' => '(pakfire:) '

         );
 
 # Translations for the %sections array.
         );
 
 # Translations for the %sections array.


@@ -76,13 +77,14 @@ my %trsections = (
         'dhcp' => "$Lang::tr{'dhcp server'}",
         'cron' => 'Cron',
         'collectd' => 'Collectd',
         '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',
         'ntp' => 'NTP',
         'ssh' => 'SSH',
         'auth' => "$Lang::tr{'loginlogout'}",
         'kernel' => "$Lang::tr{'kernel'}",
         'ipsec' => 'IPSec',
         'openvpn' => 'OpenVPN',

+        'pakfire' => 'Pakfire',

        );
 
 
        );
 
 

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 167f48f738487c3406fa1655e93efc5328c4aee5..2a4946375224ba286b83159136deb2af98264c89 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -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");
        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'}`;
        } 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");
        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'}`;
        } 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 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'}") {
        refreshpage();
 
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 2bce1922c14e9c450503993310c9d1f622835474..1080b0062136a9fe8400bb5529667c250872ab53 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -93,8 +93,8 @@ sub message {
 sub logger {
        my $log = shift;
        if ($log) {
 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\"");

        }
 }
 
        }
 }