diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 0037af183..97a2c0029 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1 +1,11 @@ etc/system-release +etc/init.d/squid +var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl diff --git a/config/rootfiles/core/49/filelists/ntfs-3g b/config/rootfiles/core/49/filelists/ntfs-3g new file mode 120000 index 000000000..d93adc2a1 --- /dev/null +++ b/config/rootfiles/core/49/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/49/update.sh b/config/rootfiles/core/49/update.sh index 7c2a8bfcd..98c4f74f5 100644 --- a/config/rootfiles/core/49/update.sh +++ b/config/rootfiles/core/49/update.sh @@ -44,7 +44,7 @@ extract_files # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's #depmod 2.6.32.28-ipfire >/dev/null 2>&1 diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fcaeb5c35..c99e7beae 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1862,35 +1862,6 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } -#test33 - -### -### Choose between adding a host-net or net-net connection -### -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') { - &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); - &Header::showhttpheaders(); - &Header::openpage($Lang::tr{'vpn configuration main'}, 1, ''); - &Header::openbigbox('100%', 'LEFT', '', ''); - &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'}); - print <$Lang::tr{'connection type'}:
- - - - - - -
$Lang::tr{'host to net vpn'}
$Lang::tr{'net to net vpn'}
-END - ; - &Header::closebox(); - &Header::closebigbox(); - &Header::closepage(); - exit (0); -### -### Adding a new connection -### } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { @@ -1904,9 +1875,10 @@ END $errormessage = $Lang::tr{'invalid key'}; goto VPNCONF_END; } + $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; - $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; + $cgiparams{'TYPE'} = 'host'; $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; @@ -1946,11 +1918,6 @@ END goto VPNCONF_ERROR; } -# if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { -# $errormessage = $Lang::tr{'ipfire side is invalid'}; -# goto VPNCONF_ERROR; -# } - # Check if there is no other entry with this name if (! $cgiparams{'KEY'}) { foreach my $key (keys %confighash) { @@ -1961,11 +1928,6 @@ END } } - if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) { - $errormessage = $Lang::tr{'invalid input for remote host/ip'}; - goto VPNCONF_ERROR; - } - if ($cgiparams{'REMOTE'}) { if (! &General::validip($cgiparams{'REMOTE'})) { if (! &General::validfqdn ($cgiparams{'REMOTE'})) { @@ -1994,10 +1956,6 @@ END } } } - if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) { - $errormessage = $Lang::tr{'remote subnet is invalid'}; - goto VPNCONF_ERROR; - } if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { $errormessage = $Lang::tr{'invalid input'}; @@ -2121,6 +2079,9 @@ END goto VPNCONF_ERROR; } } elsif ($cgiparams{'AUTH'} eq 'certgen') { + + $cgiparams{'CERT_NAME'} =~ s/ //g; + if ($cgiparams{'KEY'}) { $errormessage = $Lang::tr{'cant change certificates'}; goto VPNCONF_ERROR; @@ -2279,17 +2240,13 @@ END if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - $confighash{$key}[3] = $cgiparams{'TYPE'}; + $confighash{$key}[3] = 'host'; if ($cgiparams{'AUTH'} eq 'psk') { $confighash{$key}[4] = 'psk'; $confighash{$key}[5] = $cgiparams{'PSK'}; } else { $confighash{$key}[4] = 'cert'; } - if ($cgiparams{'TYPE'} eq 'net') { - $confighash{$key}[6] = $cgiparams{'SIDE'}; - $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; - } $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; $confighash{$key}[25] = $cgiparams{'REMARK'}; @@ -2376,7 +2333,7 @@ END } print "
"; - print ""; + print ""; if ($cgiparams{'KEY'}) { print ""; @@ -2386,7 +2343,6 @@ END &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); print "\n"; print ""; - if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { print "\n"; } else { @@ -2402,42 +2358,6 @@ END # print ""; # print ""; # print <"; - if ($cgiparams{'KEY'}) { - print ""; - } else { - print ""; - } - print <  - - - - - - - - - -ttt - - - - - - - - - - - - -END - ; - } print ""; print ""; @@ -2519,6 +2439,11 @@ END print < + + + + + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 808092e24..b78efc5da 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1749,7 +1749,7 @@ 'update transcript' => 'Aktualisieren', 'updatedatabase' => 'Datenbank auf Stand der letzten Reports setzen', 'updates' => 'Updates', -'updates installed' => 'Updates wurden installiert', +'updates installed' => 'Regelsatz vom', 'updates is old1' => 'Ihre Update-Datei ist ', 'updates is old2' => 'Tage alt. Wir empfehlen Ihnen, Ihr System über die "Updates"-Seite zu aktualisieren.', 'updxlrtr 3 months' => 'drei Monaten', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 26349e192..20a2681da 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1782,7 +1782,7 @@ 'update transcript' => 'Update transcript', 'updatedatabase' => 'Update Database with last report', 'updates' => 'Updates', -'updates installed' => 'Updates Installed', +'updates installed' => 'Ruleset update from', 'updates is old1' => 'Your update file is ', 'updates is old2' => 'days old. We recommend you update it on the System>Updates page.', 'updxlrtr 3 months' => 'three months', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index cad4406ac..e35c680b9 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1749,7 +1749,7 @@ 'update transcript' => 'Actualizar transcripción', 'updatedatabase' => 'Actualizar base de datos con el último reporte', 'updates' => 'Actualizaciones', -'updates installed' => 'Actualizaciones instaladas:', +'updates installed' => 'Conjunto de reglas de actualización de', 'updates is old1' => 'Su archivo de actualización es', 'updates is old2' => 'días de antigüedad. Recomendamos actualizarse en la página Actualizaciones del Sistema.', 'updxlrtr 3 months' => 'tres meses', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index eb81c5227..8d52e1d36 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1760,7 +1760,7 @@ 'update transcript' => 'Mettre à jour transcript', 'updatedatabase' => 'Mettre à jour la base de données avec le dernier rapport', 'updates' => 'Mises à jour', -'updates installed' => 'Mises à jour installées', +'updates installed' => 'Mise à jour de l ensemble de règles', 'updates is old1' => 'Votre fichier de mise à jour est vieux de ', 'updates is old2' => 'jours. Il est recommandé de le mettre à jour depuis la page Système>Mises à jour.', 'updxlrtr 3 months' => 'trois mois', diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 75dbbfa6b..1a1425d0c 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -88,6 +88,7 @@ case "$1" in evaluate_retval killproc /usr/bin/squidGuard >/dev/null killproc /usr/sbin/updxlrator >/dev/null + killproc /usr/bin/squidclamav >/dev/null killproc /usr/sbin/squid >/dev/null rm -rf /var/run/squid.pid fi
$Lang::tr{'name'}:$cgiparams{'NAME'}
$cgiparams{'NAME'} 
$Lang::tr{'Act as'}$Lang::tr{'remote host/ip'}:
$Lang::tr{'local subnet'}$Lang::tr{'remote subnet'}
$Lang::tr{'ovpn subnet'}
$Lang::tr{'protocol'}$Lang::tr{'destination port'}:
$Lang::tr{'comp-lzo'}
$Lang::tr{'MTU'} 
$Lang::tr{'remark title'} 
 $Lang::tr{'valid till'} (days):
  $Lang::tr{'pkcs12 file password'}:
 $Lang::tr{'pkcs12 file password'}:
($Lang::tr{'confirmation'})