ids.cgi: Format and show date of the current ruleset again

[ipfire-2.x.git] / html / cgi-bin / entropy.cgi

diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
old mode 100755 (executable)
new mode 100644 (file)
index bd3de82..d7a9ca5
--- a/html/cgi-bin/entropy.cgi
+++ b/html/cgi-bin/entropy.cgi
@@ -45,25 +45,42 @@ if ( $querry[0] ne~ "") {
        &Header::openbigbox('100%', 'left');
 
        &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
-       &Graphs::makegraphbox("entropy.cgi", "day", '', 350);
+       &Graphs::makegraphbox("entropy.cgi", "day");
        &Header::closebox();
 
        # Check for hardware support.
        my $message;
        my $message_colour = $Header::colourred;
-       if (&has_hwrng()) {
-               $message = $Lang::tr{'system has hwrng'};
-               $message_colour = $Header::colourgreen;
-       } elsif (&has_rdrand()) {
+       if (&has_rdrand()) {
                $message = $Lang::tr{'system has rdrand'};
                $message_colour = $Header::colourgreen;
-       } else {
-               $message = $Lang::tr{'no hardware random number generator'};
+       }
+
+       my $rngd_status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+       if (&rngd_is_running()) {
+               $rngd_status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
        }
 
        &Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
+       if ($message) {
+               print <<EOF;
+                       <p style="color: $message_colour; text-align: center;">$message</p>
+EOF
+       }
+
        print <<EOF;
-               <p style="color: $message_colour; text-align: center;">$message</p>
+               <table width='80%' cellspacing='1' class='tbl'>
+                       <tr>
+                               <th align='center'><b>$Lang::tr{'service'}</b></th>
+                               <th align='center'><b>$Lang::tr{'status'}</b></th>
+                       </tr>
+                       <tr>
+                               <td align='center'>
+                                       $Lang::tr{'random number generator daemon'}
+                               </td>
+                               $rngd_status
+                       </tr>
+               </table>
 EOF
        &Header::closebox();
 
@@ -71,10 +88,6 @@ EOF
        &Header::closepage();
 }
 
-sub has_hwrng() {
-       return (-c "/dev/hwrng");
-}
-
 sub has_rdrand() {
        open(FILE, "/proc/cpuinfo") or return 0;
        my @cpuinfo = <FILE>;
@@ -87,3 +100,7 @@ sub has_rdrand() {
 
        return 0;
 }
+
+sub rngd_is_running() {
+       return (-e "/var/run/rngd.pid");
+}