Fixed network.cgi

Fixed hddtemp graphs (week&month)
Fixed write permissions to html/graphs

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1178 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/7/update.sh b/config/rootfiles/core/7/update.sh
index e03f92d1ea706af53b06ac47583560fef9629b33..9da7c76640469a03a0a7c168b5b78f32a57cd5f6 100644 (file)
--- a/config/rootfiles/core/7/update.sh
+++ b/config/rootfiles/core/7/update.sh
@@ -4,4 +4,5 @@ extract_files
 GATEWAY=$(cat /var/ipfire/red/remote-ipaddress)
 echo "$GATEWAY gateway" >> /etc/hosts
 /etc/init.d/collectd start
+chown -R nobody:nobody /srv/web/ipfire/html/graphs
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b778b17a56b74955524d913da63db6d22764c675..a787b8e15b21fccf0343c5ca1a64cdfeca5a294b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -64,7 +64,6 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
-* dm9601-1.01
 * dnsmasq-2.40
 * dosfstools-2.11
 * e2fsprogs-1.39

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index 22b20485f706d4e3cdfc84b84965d52bf40b49f6..d8798727e6327f90e10d93346f93ac58429f4a63 100644 (file)
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -122,7 +122,7 @@ sub hddtempbox {
          &Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
          my $ftime = localtime((stat("$graphdir/hddtemp-$disk-week.png"))[9]);
          print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-         print "<img src='/graphs/hddtemp-$disk-day.png' border='0' />";
+         print "<img src='/graphs/hddtemp-$disk-week.png' border='0' />";
          print "<br />\n";
         &Header::closebox();
   }
@@ -131,7 +131,7 @@ sub hddtempbox {
          &Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
          my $ftime = localtime((stat("$graphdir/hddtemp-$disk-month.png"))[9]);
          print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
-         print "<img src='/graphs/hddtemp-$disk-day.png' border='0' />";
+         print "<img src='/graphs/hddtemp-$disk-month.png' border='0' />";
          print "<br />\n";
         &Header::closebox();
   }

diff --git a/html/cgi-bin/network.cgi b/html/cgi-bin/network.cgi
index 17febf73278dafa3d2d8cb3cc197608a2fd3dfc7..50f70a64f02f82d388ac47215b3813e0b7064ff8 100644 (file)
--- a/html/cgi-bin/network.cgi
+++ b/html/cgi-bin/network.cgi
@@ -51,7 +51,7 @@ $cgiparams[1] = '' unless defined $cgiparams[1];
 if ($cgiparams[1] =~ /red/) {
        &Header::openpage($Lang::tr{'network traffic graphs external'}, 1, '');
        push (@graphs, ($netsettings{'RED_DEV'}));
-       if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd") {push (@graphs, ("ipsec0"));
+       if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd") {push (@graphs, ("ipsec0"));}
 }elsif ($cgiparams[1] =~ /other/) {
        &Header::openpage($Lang::tr{'network traffic graphs others'}, 1, '');
        push (@graphs, ("lq"));

diff --git a/lfs/apache2 b/lfs/apache2
index 4ffe1216d9cb535fd22e963e39564e4a44e6b981..5a838859d2211b1c93dd5ea0353bcebdbde56b51 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -100,6 +100,7 @@ ifeq "$(PASS)" "C"
        chmod -R 755 /srv/web/ipfire/cgi-bin
        chmod -R 644 /srv/web/ipfire/html
        chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*}
+       chown nobody:nobody /srv/web/ipfire/html/graphs
 else
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch