ddns: Import latest upstream patches for ddns-013

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / services.cgi

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 2b7ee75a1a08bd9685cd51c022280318cd8308d5..26ab4f3143fff36434287ec085aaa47993726ff1 100644 (file)
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -49,13 +49,14 @@ my %servicenames =(
        $Lang::tr{'dhcp server'} => 'dhcpd',
        $Lang::tr{'web server'} => 'httpd',
        $Lang::tr{'cron server'} => 'fcron',
-       $Lang::tr{'dns proxy server'} => 'dnsmasq',
+       $Lang::tr{'dns proxy server'} => 'unbound',
        $Lang::tr{'logging server'} => 'syslogd',
        $Lang::tr{'kernel logging server'} => 'klogd',
        $Lang::tr{'ntp server'} => 'ntpd',
        $Lang::tr{'secure shell server'} => 'sshd',
        $Lang::tr{'vpn'} => 'charon',
        $Lang::tr{'web proxy'} => 'squid',
+       $Lang::tr{'intrusion detection system'} => 'suricata',
        'OpenVPN' => 'openvpn'
 );
 
@@ -71,30 +72,15 @@ my %link =(
        $Lang::tr{'vpn'} => "<a href=\'vpnmain.cgi\'>$Lang::tr{'vpn'}</a>",
        $Lang::tr{'web proxy'} => "<a href=\'proxy.cgi\'>$Lang::tr{'web proxy'}</a>",
        'OpenVPN' => "<a href=\'ovpnmain.cgi\'>OpenVPN</a>",
-       "$Lang::tr{'intrusion detection system'} (GREEN)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (GREEN)</a>",
-       "$Lang::tr{'intrusion detection system'} (RED)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (RED)</a>",
-       "$Lang::tr{'intrusion detection system'} (ORANGE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (ORANGE)</a>",
-       "$Lang::tr{'intrusion detection system'} (BLUE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (BLUE)</a>"
+       "$Lang::tr{'intrusion detection system'}" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'}</a>",
 );
 
-my $lines=0; # Used to count the outputlines to make different bgcolor
-
-my $iface = '';
-if (open(FILE, "${General::swroot}/red/iface")){
-       $iface = <FILE>;
-       close FILE;
-       chomp $iface;
-}
-
-$servicenames{"$Lang::tr{'intrusion detection system'} (RED)"}   = "snort_${iface}";
-$servicenames{"$Lang::tr{'intrusion detection system'} (GREEN)"} = "snort_$netsettings{'GREEN_DEV'}";
+# Hash to overwrite the process name of a process if it differs fromt the launch command.
+my %overwrite_exename_hash = (
+       "suricata" => "Suricata-Main"
+);
 
-if ($netsettings{'ORANGE_DEV'} ne ''){
-       $servicenames{"$Lang::tr{'intrusion detection system'} (ORANGE)"} = "snort_$netsettings{'ORANGE_DEV'}";
-}
-if ($netsettings{'BLUE_DEV'} ne ''){
-       $servicenames{"$Lang::tr{'intrusion detection system'} (BLUE)"} = "snort_$netsettings{'BLUE_DEV'}";
-}
+my $lines=0; # Used to count the outputlines to make different bgcolor
 
 my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
@@ -117,7 +103,7 @@ if ( $querry[0] =~ "processescpu"){
        print <<END
 <div align='center'>
 <table width='80%' cellspacing='1' class='tbl'>
-<tr bgcolor='$color{'color20'}'>
+<tr>
        <th align='left'><b>$Lang::tr{'services'}</b></th>
        <th align='center' ><b>$Lang::tr{'status'}</b></th>
        <th align='center'><b>PID</b></th>
@@ -161,7 +147,7 @@ END
        print <<END
 <div align='center'>
 <table width='80%' cellspacing='1' class='tbl'>
-<tr bgcolor='$color{'color20'}'>
+<tr>
        <th align='center'><b>Addon</b></th>
        <th align='center'><b>Boot</b></th>
        <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
@@ -188,6 +174,9 @@ END
                        # mdadm should not stopped with webif because this could crash the system
                        #
                        chomp($_);
+                       if ( $_ eq 'squid' ) {
+                               next;
+                       }
                        if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
                                $lines++;
                                if ($lines % 2){
@@ -197,11 +186,11 @@ END
                                        print "<tr>";
                                        $col="bgcolor='$color{'color20'}'";
                                }
-                               print "<td align='left' $col>$_</td> ";
+                               print "<td align='left' $col width='31%'>$_</td> ";
                                my $status = isautorun($_,$col);
                                print "$status ";
-                               print "<td align='center' $col><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
-                               print "<td align='center' $col><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
+                               print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
+                               print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
                                my $status = &isrunningaddon($_,$col);
                                $status =~ s/\\e\[[0-1]\;[0-9]+m//g;
 
@@ -234,12 +223,12 @@ sub isautorun{
        my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
        chomp ($init);
        if ($init ne ''){
-               $status = "<td align='center' $col><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
+               $status = "<td align='center' $col><a href='services.cgi?$_!disable'><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></a></td>";
        }
        $init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
        chomp ($init);
        if ($init ne ''){
-               $status = "<td align='center' $col><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
+               $status = "<td align='center' $col><a href='services.cgi?$_!enable'><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></a></td>";
        }
 
        return $status;
@@ -255,7 +244,20 @@ sub isrunning{
        my $memory;
 
        $cmd =~ /(^[a-z]+)/;
-       $exename = $1;
+
+       # Check if the exename needs to be overwritten.
+       # This happens if the expected process name string
+       # differs from the real one. This may happened if
+       # a service uses multiple processes or threads.
+       if (exists($overwrite_exename_hash{$1})) {
+               # Grab the string which will be reported by
+               # the process from the corresponding hash.
+               $exename = $overwrite_exename_hash{$1};
+       } else {
+               # Directly expect the launched command as
+               # process name.
+               $exename = $1;
+       }
 
        if (open(FILE, "/var/run/${cmd}.pid")){
                $pid = <FILE>; chomp $pid;