|
+
+ |
+
+END
+ } else {
+ print "$Lang::tr{'profile has errors'}\n \n";
+ }
+
+ if ( $netsettings{'GREEN_DEV'} ) { print <| $Lang::tr{'lan'}:
+ | $netsettings{'GREEN_ADDRESS'}
+ |
+END
+ if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) {
+ print "Proxy an";
+ if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; }
+ } else { print "Proxy aus"; }
+ }
+ if ( $netsettings{'BLUE_DEV'} ) { print <$Lang::tr{'wireless'}:
+ | $netsettings{'BLUE_ADDRESS'}
+ |
+END
+ if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) {
+ print "Proxy an";
+ if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
+ } else { print "Proxy aus"; }
+ }
+ if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}:
+ | $netsettings{'ORANGE_ADDRESS'}
+ | Online
+END
+ }
+ if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
+ `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
+ my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
+ print <$Lang::tr{'vpn'}:
+ | $ipsecip
+ | Online
+END
+ }
+ if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` ||
+ `cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` ||
+ `cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) {
+ my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's\/\\/255.255.255.0\/\/'`;
+ print <OpenVPN:
+ | $ovpnip
+ | Online
+END
+ }
+ if ( $netsettings{'DNS1'} ) { print <| DNS-Server: | $netsettings{'DNS1'}
+END
+ }
+ if ( $netsettings{'DNS2'} ) { print <$netsettings{'DNS2'}
+END
+ }
+print <
+END
+
+&Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{'shutdown2'});
+
+if ($death == 0 && $rebirth == 0) {
+ print <
+
+
+END
+;
+} else {
+ my $message='';
+ my $title='';
+ if ($death) {
+ $title = $Lang::tr{'shutting down'};
+ $message = $Lang::tr{'ipfire has now shutdown'};
+ } else {
+ $title = $Lang::tr{'rebooting'};
+ $message = $Lang::tr{'ipfire has now rebooted'};
+ }
+ print <$message
+END
+;
+}
+
+&Header::closebox();
+
+&Header::closebigbox();
+
+&Header::closepage();
diff --git a/html/html/dial.cgi b/html/html/dial.cgi
new file mode 100644
index 000000000..7c7b7db3c
--- /dev/null
+++ b/html/html/dial.cgi
@@ -0,0 +1,4 @@
+#!/usr/bin/perl
+
+print "Status: 302 Moved\n";
+print "Location: /cgi-bin/dial/index.cgi\n\n";
diff --git a/make.sh b/make.sh
index 1073e0e32..66e821ff2 100644
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
- VERSION="1.4" # Version number
+ VERSION="2.0" # Version number
SLOGAN="We secure your network" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10
diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index e5ccd172e..813595968 100644
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -21025,6 +21025,7 @@ home/httpd/cgi-bin/country.cgi
home/httpd/cgi-bin/credits.cgi
home/httpd/cgi-bin/ddns.cgi
home/httpd/cgi-bin/dhcp.cgi
+home/httpd/cgi-bin/dial
home/httpd/cgi-bin/dial.cgi
home/httpd/cgi-bin/dmzholes.cgi
home/httpd/cgi-bin/graphs.cgi
@@ -27209,7 +27210,7 @@ usr/bin/wget
usr/etc/wgetrc
##
## xmbmon205
-/usr/bin/mbmon
+usr/bin/mbmon
##
##
## mc
diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index bcac55346..9c680a899 100644
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -34,8 +34,6 @@ my (%settings, @ipacsum, $iface, $ERROR);
my %mbmon_settings = ();
&General::readhash("${General::swroot}/mbmon/settings", \%mbmon_settings);
-
-
# Added for conversion of utf-8 characters
use Encode 'from_to';
my %tr=();
@@ -68,9 +66,8 @@ my @args = ();
my $count = 0;
my $ERROR;
my $dbg = 0;
-my $path_rrd = "/var/log/rrd";
-my $path_graphs = "/home/httpd/html/graphs";
my $path_smartctl = "/usr/sbin/smartctl";
+my $path_hddtemp = "/usr/sbin/hddtemp";
my %colors = ();
$colors{"1"} = "#0000FF";
@@ -715,10 +712,10 @@ sub updatelqgraph {
sub updatehdddata
{
- if ( ! -e "$path_rrd/hddtemp.rrd")
+ if ( ! -e "$rrdlog/hddtemp.rrd")
{
# database did not exist -> create
- RRDs::create ("$path_rrd/hddtemp.rrd", "--step=300",
+ RRDs::create ("$rrdlog/hddtemp.rrd", "--step=300",
"DS:temperature:GAUGE:600:0:100",
"RRA:AVERAGE:0.5:1:576",
"RRA:AVERAGE:0.5:6:672",
@@ -781,7 +778,7 @@ sub updatehdddata
# print "hdd $hdd_output \n";
# print "temp $temp \n";
- RRDs::update ("$path_rrd/hddtemp.rrd", "-t", "temperature", "N:$temp");
+ RRDs::update ("$rrdlog/hddtemp.rrd", "-t", "temperature", "N:$temp");
$ERROR = RRDs::error;
print "Error in RRD::update for hdd: $ERROR\n" if $ERROR;
@@ -809,11 +806,11 @@ sub updatehddgraph {
sub updatembmondata
{
- if ( ! -e "$path_rrd/mbmon.rrd" )
+ if ( ! -e "$rrdlog/mbmon.rrd" )
{
# database did not exist -> create
- @args = ("$path_rrd/mbmon.rrd");
+ @args = ("$rrdlog/mbmon.rrd");
push(@args, "--step=300");
foreach $key ( sort(keys %mbmon_values) )
@@ -848,7 +845,7 @@ sub updatembmondata
print("update template = '$template'\n") if ( $dbg );
print("update value = '$value'\n") if ( $dbg );
- RRDs::update("$path_rrd/mbmon.rrd", "-t", $template, $value);
+ RRDs::update("$rrdlog/mbmon.rrd", "-t", $template, $value);
$ERROR = RRDs::error;
print("Error in RRD::update for mbmon: $ERROR\n") if $ERROR;
}
@@ -858,7 +855,7 @@ sub updatetempgraph
my $type = "temp";
my $period = $_[0];
- @args = ("$path_graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+ @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
"--color", "SHADEA#EAE9EE",
"--color", "SHADEB#EAE9EE",
@@ -875,7 +872,7 @@ sub updatetempgraph
$mbmon_settings{'LABEL-'.$key} = $key;
}
- push(@args, "DEF:$key=$path_rrd/mbmon.rrd:$key:AVERAGE");
+ push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
push(@args, "LINE2:$key$colors{$count}:$mbmon_settings{'LABEL-'.$key} $tr{'mbmon temp in'} °C");
push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.1lf °C");
push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.1lf °C");
@@ -898,7 +895,7 @@ sub updatefangraph
my $type = "fan";
my $period = $_[0];
- @args = ("$path_graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+ @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
"--color", "SHADEA#EAE9EE",
"--color", "SHADEB#EAE9EE",
@@ -915,7 +912,7 @@ sub updatefangraph
$mbmon_settings{'LABEL-'.$key} = $key;
}
- push(@args, "DEF:$key=$path_rrd/mbmon.rrd:$key:AVERAGE");
+ push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
push(@args, "LINE2:$key$colors{$count}:$mbmon_settings{'LABEL-'.$key} $tr{'mbmon fan in'} rpm");
push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.0lf rpm");
push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.0lf rpm");
@@ -938,7 +935,7 @@ sub updatevoltgraph
my $type = "volt";
my $period = $_[0];
- @args = ("$path_graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
+ @args = ("$graphs/mbmon-$type-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
"--color", "SHADEA#EAE9EE",
"--color", "SHADEB#EAE9EE",
@@ -956,7 +953,7 @@ sub updatevoltgraph
$mbmon_settings{'LABEL-'.$key} = $key;
}
- push(@args, "DEF:$key=$path_rrd/mbmon.rrd:$key:AVERAGE");
+ push(@args, "DEF:$key=$rrdlog/mbmon.rrd:$key:AVERAGE");
push(@args, "LINE2:$key$colors{$count}:$mbmon_settings{'LABEL-'.$key} V");
push(@args, "GPRINT:$key:MAX:$tr{'maximal'}\\:%5.2lf V");
push(@args, "GPRINT:$key:AVERAGE:$tr{'average'}\\:%5.2lf V");
| | | | | | |