# Convert udev persistent network rules
sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
+# Firstsetup was already run
+touch /var/ipfire/main/firstsetup_ok
+
#
# Start services
#
if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- if [ $BOOTSPACE -lt 9000 -o $ROOTSPACE -lt 90000 ]; then
+ if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
/usr/bin/logger -p syslog.emerg -t ipfire \
"core-update-$core: WARNING not enough space for pae kernel."
else
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.18
+usr/lib/libclamav.so.6.1.20
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.18
+usr/lib/libclamunrar.so.6.1.20
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.18
+usr/lib/libclamunrar_iface.so.6.1.20
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: driver
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
+WARNING: untranslated string: fwdfw dnat extport
+WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
+WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: outgoing firewall p2p deny
WARNING: untranslated string: ovpn errmsg green already pushed
WARNING: untranslated string: ovpn errmsg invalid ip or mask
+WARNING: untranslated string: ovpn mgmt in root range
WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
WARNING: untranslated string: ovpn mtu-disc maybe
WARNING: untranslated string: ovpn mtu-disc off
WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: ovpn no connections
+WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: ovpn routes push
WARNING: untranslated string: ovpn routes push options
WARNING: untranslated string: p2p block
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
+WARNING: untranslated string: fwdfw dnat extport
+WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
+WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: openvpn prefix remote subnet
WARNING: untranslated string: openvpn subnet is used
WARNING: untranslated string: other
+WARNING: untranslated string: ovpn mgmt in root range
WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
WARNING: untranslated string: ovpn mtu-disc maybe
WARNING: untranslated string: ovpn mtu-disc off
WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: ovpn no connections
+WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
+WARNING: untranslated string: fwdfw dnat extport
+WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
+WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: most preferred
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn network
+WARNING: untranslated string: ovpn mgmt in root range
+WARNING: untranslated string: ovpn no connections
+WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: qos enter bandwidths
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
+WARNING: untranslated string: fwdfw dnat extport
+WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
+WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: outgoing firewall p2p deny
WARNING: untranslated string: ovpn errmsg green already pushed
WARNING: untranslated string: ovpn errmsg invalid ip or mask
+WARNING: untranslated string: ovpn mgmt in root range
WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
WARNING: untranslated string: ovpn mtu-disc maybe
WARNING: untranslated string: ovpn mtu-disc off
WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: ovpn no connections
+WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: ovpn routes push
WARNING: untranslated string: ovpn routes push options
WARNING: untranslated string: p2p block
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
+WARNING: untranslated string: fwdfw dnat extport
+WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
+WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: openvpn subnet is used
WARNING: untranslated string: other
WARNING: untranslated string: outgoing traffic in bytes per second
+WARNING: untranslated string: ovpn mgmt in root range
WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
WARNING: untranslated string: ovpn mtu-disc maybe
WARNING: untranslated string: ovpn mtu-disc off
WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment
WARNING: untranslated string: ovpn mtu-disc yes
+WARNING: untranslated string: ovpn no connections
+WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: proxy reports
WARNING: translation string unused: dmz pinhole rule added
WARNING: translation string unused: dmz pinhole rule removed
WARNING: translation string unused: dmzpinholes for same net not necessary
-WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
+WARNING: untranslated string: fwdfw dnat extport
+WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
+WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: most preferred
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn network
+WARNING: untranslated string: ovpn mgmt in root range
+WARNING: untranslated string: ovpn no connections
+WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: red1
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
+< fwdfw dnat extport
+< fwdfw dnat nochoice
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
+< ipsec
< ipsec network
+< ipsec no connections
< least preferred
< lifetime
< minute
< openvpn subnet is used
< other
< our donors
+< ovpn mgmt in root range
< ovpn mtu-disc
< ovpn mtu-disc and mtu not 1500
< ovpn mtu-disc maybe
< ovpn mtu-disc off
< ovpn mtu-disc with mssfix or fragment
< ovpn mtu-disc yes
+< ovpn no connections
+< ovpn port in root range
< p2p block
< p2p block save notice
< proxy reports
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
+< fwdfw dnat extport
+< fwdfw dnat nochoice
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
+< ipsec
< ipsec network
+< ipsec no connections
< least preferred
< lifetime
< minute
< outgoing firewall view group
< ovpn errmsg green already pushed
< ovpn errmsg invalid ip or mask
+< ovpn mgmt in root range
< ovpn mtu-disc
< ovpn mtu-disc and mtu not 1500
< ovpn mtu-disc maybe
< ovpn mtu-disc off
< ovpn mtu-disc with mssfix or fragment
< ovpn mtu-disc yes
+< ovpn no connections
+< ovpn port in root range
< ovpn routes push
< ovpn routes push options
< p2p block
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
+< fwdfw dnat extport
+< fwdfw dnat nochoice
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
+< ipsec
< ipsec network
+< ipsec no connections
< least preferred
< lifetime
< minute
< our donors
< ovpn errmsg green already pushed
< ovpn errmsg invalid ip or mask
+< ovpn mgmt in root range
< ovpn mtu-disc
< ovpn mtu-disc and mtu not 1500
< ovpn mtu-disc maybe
< ovpn mtu-disc off
< ovpn mtu-disc with mssfix or fragment
< ovpn mtu-disc yes
+< ovpn no connections
+< ovpn port in root range
< ovpn routes push
< ovpn routes push options
< p2p block
< fwdfw delete
< fwdfw dnat
< fwdfw dnat error
+< fwdfw dnat extport
+< fwdfw dnat nochoice
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< integrity
< invalid input for dpd delay
< invalid input for dpd timeout
+< ipsec
< ipsec network
+< ipsec no connections
< least preferred
< lifetime
< minute
< other
< our donors
< outgoing traffic in bytes per second
+< ovpn mgmt in root range
< ovpn mtu-disc
< ovpn mtu-disc and mtu not 1500
< ovpn mtu-disc maybe
< ovpn mtu-disc off
< ovpn mtu-disc with mssfix or fragment
< ovpn mtu-disc yes
+< ovpn no connections
+< ovpn port in root range
< p2p block
< p2p block save notice
< proxy reports
\$("#protocol").change(update_protocol);
update_protocol();
- // When nat not used, hide it
- if (! \$("#USE_NAT").attr("checked")) {
+ // Show/Hide elements when NAT checkbox is checked.
+ if (\$("#USE_NAT").attr("checked")) {
+ \$("#actions").hide();
+ } else {
\$(".NAT").hide();
}
// Show NAT area when "use nat" checkbox is clicked
\$("#USE_NAT").change(function() {
\$(".NAT").toggle();
+ \$("#actions").toggle();
});
// Time constraints
{
#check valid port for NAT
if($fwdfwsettings{'USE_NAT'} eq 'ON'){
+ #RULE_ACTION must be ACCEPT if we use NAT
+ $fwdfwsettings{'RULE_ACTION'} = 'ACCEPT';
+
+ #if no dnat or snat selected errormessage
+ if ($fwdfwsettings{'nat'} eq ''){
+ $errormessage=$Lang::tr{'fwdfw dnat nochoice'};
+ return;
+ }
+
+ #if using snat, the external port has to be empty
+ if ($fwdfwsettings{'nat'} eq 'snat' && $fwdfwsettings{'dnatport'} ne ''){
+ $errormessage=$Lang::tr{'fwdfw dnat extport'};
+ return;
+ }
#if no dest port is given in nat area, take target host port
if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){
$errormessage=$Lang::tr{'fwdfw dnat porterr2'};
+ return;
}
#check if port given in nat area is a single valid port or portrange
if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){
$errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";
}elsif($fwdfwsettings{'USESRV'} eq 'ON' && $fwdfwsettings{'grp3'} eq 'cust_srv'){
my $custsrvport;
- #get servcie Protocol and Port
+ #get service Protocol and Port
foreach my $key (sort keys %customservice){
if($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]){
if ($customservice{$key}[2] ne 'TCP' && $customservice{$key}[2] ne 'UDP'){
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
- print"<hr>";
}
}
sub fillselect
print<<END;
<table width='100%' border='0'>
<tr><td width='50%' valign='top'>
- <table width='100%' border='0'>
+ <table width='95%' border='0'>
<tr><td width='1%'><input type='radio' name='$grp' id='std_net_$srctgt' value='std_net_$srctgt' $checked{$grp}{'std_net_'.$srctgt}></td><td>$Lang::tr{'fwhost stdnet'}</td><td align='right'><select name='std_net_$srctgt' style='width:200px;'>
END
foreach my $network (sort keys %defaultNetworks)
print"</select></td>";
}
#End left table. start right table (vpn)
- print"</tr></table></td><td valign='top'><table width='100%' border='0'><tr>";
+ print"</tr></table></td><td valign='top'><table width='95%' border='0' align='right'><tr>";
# CCD networks
if( ! -z $configccdnet || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
print"<td width='1%'><input type='radio' name='$grp' id='ovpn_net_$srctgt' value='ovpn_net_$srctgt' $checked{$grp}{'ovpn_net_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdnet'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_net_$srctgt' style='width:200px;'>";
$checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
$checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
$checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED';
- $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
$checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED';
$checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED';
$checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED';
- $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
+ $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected';
$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected';
$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
- $selected{'dnat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
- $selected{'snat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
}
}
$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
}
}else{
$fwdfwsettings{'ACTIVE'}='ON';
+ $fwdfwsettings{'nat'} = 'dnat';
$checked{'ACTIVE'}{$fwdfwsettings{'ACTIVE'}} = 'CHECKED';
+ $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED';
$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
$fwdfwsettings{'oldgrp1b'}=$fwdfwsettings{$fwdfwsettings{'grp1'}};
$fwdfwsettings{'oldgrp2a'}=$fwdfwsettings{'grp2'};
&Header::closebox;
$checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = 'CHECKED';
print <<END;
- <br>
<center>
- <table width="80%" class='tbl'>
+ <table width="80%" class='tbl' id='actions'>
<tr>
<td width="33%" align="center" bgcolor="$color{'color17'}">
<br>
<input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' />
<input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' />
<input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' />
- <input type='hidden' name='nat' value='$fwdfwsettings{'nat'}' />
<input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
</table></form>
END
--- /dev/null
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use strict;
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+require "/opt/pakfire/lib/functions.pl";
+
+
+my %cgiparams;
+my $refresh;
+
+if ( -e "/var/ipfire/main/gpl_accepted" ) {
+ print "Status: 302 Moved Temporarily\n";
+ print "Location: index.cgi\n\n";
+ exit (0);
+}
+&Header::showhttpheaders();
+
+$cgiparams{'ACTION'} = '';
+&Header::getcgihash(\%cgiparams);
+
+&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
+&Header::openbigbox('', 'center');
+
+# licence agreement
+if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
+ system('touch /var/ipfire/main/gpl_accepted');
+}
+
+&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
+print <<END;
+ $Lang::tr{'gpl please read carefully the general public license and accept it below'}.
+ <br /><br />
+END
+;
+if ( -e "/usr/share/doc/licenses/GPLv3" ) {
+ print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
+ print `cat /usr/share/doc/licenses/GPLv3`;
+ print '</textarea>';
+}
+else {
+ print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
+}
+print <<END;
+ <p>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
+ <br/ >
+ <input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
+ </form>
+ </p>
+ <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
+
+END
+
+&Header::closebox();
+&Header::closebigbox();
+&Header::closepage();
use strict;
use Net::Telnet;
+use Sort::Naturally;
# enable only the following on debugging purpose
#use warnings;
my %modemsettings=();
my %netsettings=();
my %ddnssettings=();
+my %proxysettings=();
+my %vpnsettings=();
+my %vpnconfig=();
+my %ovpnconfig=();
my $warnmessage = '';
my $refresh = "";
my $ipaddr='';
-
-my $haveipsec=0;
-my $haveovpn=0;
+my $showbox=0;
+my $showipsec=0;
+my $showovpn=0;
+
+if ( ! -e "/var/ipfire/main/gpl_accepted" ) {
+ print "Status: 302 Moved Temporarily\n";
+ print "Location: gpl.cgi\n\n";
+ exit (0);
+}
&Header::showhttpheaders();
&General::readhash("${General::swroot}/modem/settings", \%modemsettings);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/ddns/settings", \%ddnssettings);
+&General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
+&General::readhash("${General::swroot}/vpn/settings", \%vpnsettings);
my %color = ();
my %mainsettings = ();
my $connstate = &Header::connectionstatus();
- if ( -e "/var/ipfire/main/gpl-accepted" ) {
-if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
- $refresh = "<meta http-equiv='refresh' content='5;'>";
-} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
- $refresh = "<meta http-equiv='refresh' content='30;'>";
-}
+if ( -e "/var/ipfire/main/gpl-accepted" ) {
+ if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
+ $refresh = "<meta http-equiv='refresh' content='5;'>";
+ }elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
+ $refresh = "<meta http-equiv='refresh' content='30;'>";
+ }
}
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
unlink("${General::swroot}/ppp/settings");
link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
"${General::swroot}/ppp/settings");
- system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
-
+ open (TMP, ">${General::swroot}/ppp/updatesettings");
+ close TMP;
# read in the new params "early" so we can write secrets.
%cgiparams = ();
&General::readhash("${General::swroot}/ppp/settings", \%cgiparams);
if ($cgiparams{'ACTION'} eq $Lang::tr{'dial'}) {
system('/usr/local/bin/redctrl start > /dev/null') == 0
- or &General::log("Dial failed: $?"); sleep 1;}
-elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) {
+ or &General::log("Dial failed: $?"); sleep 1;
+}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) {
system('/usr/local/bin/redctrl stop > /dev/null') == 0
- or &General::log("Hangup failed: $?"); sleep 1;}
+ or &General::log("Hangup failed: $?"); sleep 1;
+}
my $c;
my $maxprofiles = 5;
$selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'";
my $dialButtonDisabled = "disabled='disabled'";
-
&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
&Header::openbigbox('', 'center');
+if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
+ $ipaddr = <IPADDR>;
+ close IPADDR;
+ chomp ($ipaddr);
+ }
-# licence agreement
-if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
- system('touch /var/ipfire/main/gpl_accepted')
-}
-if ( -e "/var/ipfire/main/gpl_accepted" ) {
&Header::openbox('100%', 'center', '');
-
-
if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
if (open(IPADDR,"${General::swroot}/ddns/ipcache")) {
$ipaddr = <IPADDR>;
close IPADDR;
chomp ($ipaddr);
}
- if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
- $ipaddr = <IPADDR>;
- close IPADDR;
- chomp ($ipaddr);
- }
} elsif ($modemsettings{'VALID'} eq 'no') {
print "$Lang::tr{'modem settings have errors'}\n </b></font>\n";
} else {
print <<END;
<!-- Table of networks -->
-<table width=80% class='tbl'>
+<table width=80% class='tbl' >
<tr> <th bgcolor='$color{'color20'}'>$Lang::tr{'network'}</th>
<th bgcolor='$color{'color20'}'>$Lang::tr{'ip address'}</th>
<th bgcolor='$color{'color20'}'>$Lang::tr{'status'}</th></tr>
<tr> <td align='center' bgcolor='$Header::colourred' width='25%'><a href="/cgi-bin/pppsetup.cgi"><font size='2' color='white'><b>$Lang::tr{'internet'}</b></font></a><br></td>
<td width='30%' align='center'>$ipaddr </td>
- <td width='45%' align='center'>$connstate
+ <td width='45%' align='center'>$connstate </td></tr>
END
my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
if ( "$HOSTNAME" ne "" ) {
print <<END;
- <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME<td>
+ <tr><td><b>Hostname:</b><td align='center'>$HOSTNAME</td><td></td>
END
}
- if ( -e "/var/ipfire/red/remote-ipaddress" ) {
- my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`;
+ if ( -e "${General::swroot}/red/remote-ipaddress" ) {
+ open (TMP, "<${General::swroot}/red/remote-ipaddress");
+ my $GATEWAY = <TMP>;
chomp($GATEWAY);
+ close TMP;
print <<END;
- <tr><td><b>Gateway:</b><td align='center'>$GATEWAY<td>
+ <tr><td><b>Gateway:</b><td align='center'>$GATEWAY</td><td></td></tr>
END
}
-
- my $DNS1 = `cat /var/ipfire/red/dns1`;
- my $DNS2 = `cat /var/ipfire/red/dns2`;
- chomp($DNS1);
+ #Read DNS server 1
+ open (DNS1, "<${General::swroot}/red/dns1");
+ my $DNS1 = <DNS1>;
chomp($DNS1);
+ close DNS1;
+ #Read DNS server 2
+ open (DNS2, "<${General::swroot}/red/dns2");
+ my $DNS2 = <DNS2>;
+ chomp($DNS2);
+ close DNS2;
if ( $DNS1 ) { print <<END;
- <tr><td><b>DNS-Server:</b><td align='center'>$DNS1
+ <tr><td><b>$Lang::tr{'dns server'}1:</b></td><td align='center'>$DNS1</td><td></td></tr>
END
}
if ( $DNS2 ) { print <<END;
- <td align='center'>$DNS2
+ <tr><td><b>$Lang::tr{'dns server'}2:</b></td><td align='center'>$DNS2</td><td></td></tr>
+ </table>
END
} else { print <<END;
- <td> </td>
+ <td></td>
</tr>
</table>
+
END
}
<td width='30%' align='center'>$netsettings{'GREEN_ADDRESS'}/$sub
<td width='45%' align='center'>
END
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) {
- print $Lang::tr{'advproxy on'};
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; }
+ if ( $proxysettings{'ENABLE'} eq 'on' ) {
+ print $Lang::tr{'advproxy on'};
+ if ( $proxysettings{'TRANSPARENT'} eq 'on' ) { print " (transparent)"; }
} else { print $Lang::tr{'advproxy off'}; }
}
if ( $netsettings{'BLUE_DEV'} ) {
<td width='30%' align='center'>$netsettings{'BLUE_ADDRESS'}/$sub
<td width='45%' align='center'>
END
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) {
- print $Lang::tr{'advproxy on'};
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
+ if ( $proxysettings{'ENABLE_BLUE'} eq 'on' ) {
+ print $Lang::tr{'advproxy on'};
+ if ( $proxysettings{'TRANSPARENT_BLUE'} eq 'on' ) { print " (transparent)"; }
} else { print $Lang::tr{'advproxy off'}; }
}
if ( $netsettings{'ORANGE_DEV'} ) {
END
}
#check if IPSEC is running
-if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
- `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
- $haveipsec=1;
- my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
+if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
+ my $ipsecip = $vpnsettings{'VPN_IP'};
print<<END;
<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'ipsec'}</b></font></a><br>
<td width='30%' align='center'>$ipsecip
my ($ovpnip,$sub) = split("/",$confighash{'DOVPN_SUBNET'});
$sub=&General::iporsubtocidr($sub);
$ovpnip="$ovpnip/$sub";
- $haveovpn=1;
print <<END;
<tr>
<td align='center' bgcolor='$Header::colourovpn' width='25%'>
print"</td></tr></table>";
&Header::closebox();
-# Start of Box wich contains all vpn connections
- &Header::openbox('100%', 'center', $Lang::tr{'vpn'}) if ($haveipsec || $haveovpn);
+#Check if there are any vpns configured (ipsec and openvpn)
+&General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig);
+foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) {
+ if ($vpnconfig{$key}[0] eq 'on'){
+ $showipsec=1;
+ $showbox=1;
+ last;
+ }
+}
+&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig);
+foreach my $dkey (sort { ncmp($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
+ if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
+ $showbox=1;
+ $showovpn=1;
+ last;
+ }
+}
+if ($showbox){
+# Start of Box wich contains all vpn connections
+ &Header::openbox('100%', 'center', $Lang::tr{'vpn'});
#show ipsec connectiontable
- if ( $haveipsec ) {
- my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
+ if ( $showipsec ) {
+ my $ipsecip = $vpnsettings{'VPN_IP'};
my @status = `/usr/local/bin/ipsecctrl I`;
my %confighash = ();
- &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
+ my $id = 0;
+ my $gif;
+ my $col="";
+ my $count=0;
print <<END;
<br>
<table width='80%' class='tbl'>
<tr>
- <th>$Lang::tr{'ipsec network'}</th>
- <th>$Lang::tr{'ip address'}</th>
- <th>$Lang::tr{'status'}</th>
+ <th width='40%'>$Lang::tr{'ipsec network'}</th>
+ <th width='30%'>$Lang::tr{'ip address'}</th>
+ <th width='30%'>$Lang::tr{'status'}</th>
</tr>
END
- my $id = 0;
- my $gif;
- my $col="";
- foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
- if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
- my ($vpnip,$vpnsub) = split("/",$confighash{$key}[11]);
- $vpnsub=&General::iporsubtocidr($vpnsub);
- $vpnip="$vpnip/$vpnsub";
- if ($id % 2) {
- $col="bgcolor='$color{'color20'}'";
- print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn' width='50%'><font color=white>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center' $col>$vpnip</td>";
- } else {
- $col="bgcolor='$color{'color22'}'";
- print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn' width='50%'><font color=white>$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td><td align='center' $col>$vpnip</td>";
- }
-
- my $active = "<td bgcolor='${Header::colourred}' width='15%' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
- if ($confighash{$key}[0] eq 'off') {
- $active = "<td bgcolor='${Header::colourblue}' width='15%' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
- } else {
- foreach my $line (@status) {
- if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
- ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
- {
- $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
+ foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
+ if ($vpnconfig{$key}[0] eq 'on') {
+ $count++;
+ my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
+ $vpnsub=&General::iporsubtocidr($vpnsub);
+ $vpnip="$vpnip/$vpnsub";
+ if ($count % 2){
+ $col="bgcolor='$color{'color22'}'";
+ }else{
+ $col="bgcolor='$color{'color20'}'";
+ }
+ if ($id % 2) {
+ print "<tr><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>";
+ } else {
+ print "<tr></td><td align='left' nowrap='nowrap' bgcolor='$Header::colourvpn'><font color=white>$vpnconfig{$key}[1]</td><td align='center' $col>$vpnip</td>";
+ }
+ my $active = "<td bgcolor='${Header::colourred}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
+ if ($vpnconfig{$key}[0] eq 'off') {
+ $active = "<td bgcolor='${Header::colourblue}' align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td>";
+ } else {
+ foreach my $line (@status) {
+ if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
+ $active = "<td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td>";
+ }
+ }
}
- }
+ print "$active</td>";
}
- print "$active</td>";
}
print "</tr></table>";
}
# Check if there is any OpenVPN connection configured.
###
-if ( $haveovpn )
-{
- print <<END;
- <br>
- <table width='80%' class='tbl'>
- <tr>
- <th>$Lang::tr{'openvpn network'}</th>
- <th>$Lang::tr{'ip address'}</th>
- <th>$Lang::tr{'status'}</th>
+ if ( $showovpn ){
+ print <<END;
+ <br>
+ <table width='80%' class='tbl'>
+ <tr>
+ <th width='40%'>$Lang::tr{'openvpn network'}</th>
+ <th width='30%'>$Lang::tr{'ip address'}</th>
+ <th width='30%'>$Lang::tr{'status'}</th>
END
- # Check if the OpenVPN server for Road Warrior Connections is running and display status information.
- my %confighash=();
- &General::readhash("${General::swroot}/ovpn/settings", \%confighash);
- # Print the OpenVPN N2N connection status.
- if ( -d "${General::swroot}/ovpn/n2nconf") {
- my %confighash=();
-
- &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
- my $lines;
- my $col="";
- foreach my $dkey (keys %confighash) {
- $lines++;
- if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) {
- my $tport = $confighash{$dkey}[22];
- next if ($tport eq '');
-
- my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport);
- $tnet->open('127.0.0.1');
- my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
- my @tustate = split(/\,/, $output[1]);
-
- my $display;
- my $display_colour = $Header::colourred;
- if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) {
- $display_colour = $Header::colourgreen;
- $display = $Lang::tr{'capsopen'};
- } else {
- $display = $tustate[1];
- }
- if ($lines %2){
- $col="bgcolor='$color{'color20'}'";
- }else{
- $col="bgcolor='$color{'color22'}'";
- }
- #make cidr from ip
- my ($vpnip,$vpnsub) = split("/",$confighash{$dkey}[11]);
- my $vpnsub=&General::iporsubtocidr($vpnsub);
- my $vpnip="$vpnip/$vpnsub";
- print <<END;
- <tr>
- <td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn' width='50%'><font color=white>
- $confighash{$dkey}[1]
- </td>
- <td align='center' $col>
- $vpnip
- </td>
- <td align='center' bgcolor='$display_colour' width='15%'>
- <b>
- <font color='#FFFFFF'>
- $display
- </font>
- </b>
- </td>
- </tr>
+ # Check if the OpenVPN server for Road Warrior Connections is running and display status information.
+ my $active;
+ my $count=0;
+ # Print the OpenVPN N2N connection status.
+ if ( -d "${General::swroot}/ovpn/n2nconf") {
+ my $col="";
+ foreach my $dkey (sort { ncmp ($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
+ if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
+ $count++;
+ my $tport = $ovpnconfig{$dkey}[22];
+ next if ($tport eq '');
+ my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport);
+ $tnet->open('127.0.0.1');
+ my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+ my @tustate = split(/\,/, $output[1]);
+ my $display;
+ my $display_colour = $Header::colourred;
+ if ( $tustate[1] eq 'CONNECTED' || ($tustate[1] eq 'WAIT')) {
+ $display_colour = $Header::colourgreen;
+ $display = $Lang::tr{'capsopen'};
+ } else {
+ $display = $tustate[1];
+ }
+ if ($count %2){
+ $col="bgcolor='$color{'color22'}'";
+ }else{
+ $col="bgcolor='$color{'color20'}'";
+ }
+ $active='off';
+ #make cidr from ip
+ my ($vpnip,$vpnsub) = split("/",$ovpnconfig{$dkey}[11]);
+ my $vpnsub=&General::iporsubtocidr($vpnsub);
+ my $vpnip="$vpnip/$vpnsub";
+ print <<END;
+ <tr>
+ <td align='left' nowrap='nowrap' bgcolor='$Header::colourovpn'><font color='white'>$ovpnconfig{$dkey}[1]</font></td>
+ <td align='center' $col>$vpnip</td>
+ <td align='center' bgcolor='$display_colour' ><b><font color='#FFFFFF'>$display</font></b></td>
+ </tr>
END
+ }
}
}
+ if ($active ne 'off'){
+ print "<tr><td colspan='3' align='center'>$Lang::tr{'ovpn no connections'}</td></tr>";
+ }
+ print"</table>";
}
-}
&Header::closebox();
+}
+
# Fireinfo
if ( ! -e "/var/ipfire/main/send_profile") {
$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";
$warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
}
-
if ($warnmessage) {
+ &Header::openbox('100%','center', );
+ print "<table width='80%' class='tbl'>";
+ print "<tr><th>$Lang::tr{'fwhost hint'}</th></tr>";
print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
+ &Header::closebox();
}
-print <<END;
-</table>
-END
-;
+
+print "<div align='center'>";
&Pakfire::dblist("upgrade", "notice");
-print <<END;
-END
if ( -e "/var/run/need_reboot" ) {
print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
}
-&Header::closebox();
-}
-else {
-&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
-print <<END;
- $Lang::tr{'gpl please read carefully the general public license and accept it below'}.
- <br /><br />
-END
-;
-if ( -e "/usr/share/doc/licenses/GPLv3" ) {
- print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
- print `cat /usr/share/doc/licenses/GPLv3`;
- print '</textarea>';
-}
-else {
- print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
-}
-print <<END;
- <p>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
- <br/ >
- <input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
- </form>
- </p>
- <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
-
-END
-
-&Header::closebox();
-}
+print "</div>";
&Header::closebigbox();
&Header::closepage();
'fwdfw delete' => 'Löschen',
'fwdfw dnat' => 'Destination-NAT (Port-Weiterleitung)',
'fwdfw dnat error' => 'Für Destination-NAT muss ein einzelner Host als Ziel ausgewählt werden. Gruppen oder Netzwerke sind nicht erlaubt',
-'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden',
+'fwdfw dnat extport' => 'Bei Source-NAT-Regeln darf der externe Port nicht gesetzt sein.',
+'fwdfw dnat nochoice' => 'Bitte wählen Sie Source-NAT oder Destination-NAT im NAT-Bereich aus.',
+'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden.',
'fwdfw dnat porterr2' => 'Externer Port (NAT) darf nur angegeben werden, wenn ein Ziel-Port definiert ist.',
'fwdfw edit' => 'Bearbeiten',
'fwdfw err nosrc' => 'Keine Quelle ausgewählt',
'ipfire side is invalid' => 'IPFire Seite ist ungültig.',
'ipfires hostname' => 'IPFire\'s Hostname',
'ipinfo' => 'IP-Info',
-'iptable rules' => 'IPTable-Regeln',
-'iptmangles' => 'IPTable Mangles',
'ipsec' => 'IPsec',
'ipsec network' => 'IPsec-Netzwerke',
+'ipsec no connections' => 'Keine aktiven IPsec Verbindungen',
+'iptable rules' => 'IPTable-Regeln',
+'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
'ovpn log' => 'OVPN-Log',
+'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
'ovpn mtu-disc' => 'Path MTU Discovery',
'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery benötigt eine MTU von 1500.',
'ovpn mtu-disc maybe' => 'Optional',
'ovpn mtu-disc off' => 'Deaktiviert',
'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.',
'ovpn mtu-disc yes' => 'Forciert',
+'ovpn no connections' => 'Keine aktiven OpenVPN Verbindungen',
'ovpn on blue' => 'OpenVPN auf BLAU',
'ovpn on orange' => 'OpenVPN auf ORANGE',
'ovpn on red' => 'OpenVPN auf ROT',
-'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
'ovpn port in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24',
'ovpn routes push options' => 'Route push Optionen',
'fwdfw delete' => 'Delete',
'fwdfw dnat' => 'Destination NAT (Port forwarding)',
'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.',
+'fwdfw dnat extport' => 'The external port has to be empty when using Source NAT rules.',
+'fwdfw dnat nochoice' => 'Please pick Source NAT or Destination NAT from the NAT section.',
'fwdfw dnat porterr' => 'You have to select a single port or portrange (tcp/udp) for NAT',
'fwdfw dnat porterr2' => 'Cannot use external port (NAT) when no destination port is defined.',
'fwdfw edit' => 'Edit',
'ipinfo' => 'IP info',
'ipsec' => 'IPsec',
'ipsec network' => 'IPsec network',
+'ipsec no connections' => 'No active IPsec connections',
'iptable rules' => 'IPTable rules',
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ovpn errmsg green already pushed' => 'Route for green network is always set',
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
'ovpn log' => 'OVPN-Log',
+'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.',
'ovpn mtu-disc' => 'Path MTU Discovery',
'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.',
'ovpn mtu-disc maybe' => 'Optionally',
'ovpn mtu-disc off' => 'Disabled',
'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.',
'ovpn mtu-disc yes' => 'Forced',
+'ovpn no connections' => 'No active OpenVPN connections',
'ovpn on blue' => 'OpenVPN on BLUE',
'ovpn on orange' => 'OpenVPN on ORANGE',
'ovpn on red' => 'OpenVPN on RED',
-'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.',
'ovpn port in root range' => 'A port number of 1024 or higher is required.',
'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
'ovpn routes push options' => 'Route push options',
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
include Config
-VER = 0.98
+VER = 0.98.1
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 23
+PAK_VER = 24
DEPS = ""
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ca0b8c930efcb8be1d47592d268006c5
+$(DL_FILE)_MD5 = b1ec7b19dea8385954515ef1d63576d8
install : $(TARGET)
projects / people / teissler / ipfire-2.x.git / commitdiff
