IPFire-SCM September 2011

ipfire-scm@lists.ipfire.org

1 participants
47 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core52, created. 667a22ed1c86cc969143c626cb9d85040370fd9b
by git＠ipfire.org 07 Sep '11

07 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core52 has been created at 667a22ed1c86cc969143c626cb9d85040370fd9b (commit) - Log ----------------------------------------------------------------- commit 667a22ed1c86cc969143c626cb9d85040370fd9b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 6 12:44:45 2011 +0200 core52: stop/start squid at update. commit fc8c4295ac9e33fa73f1d83e3d7567702831e638 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 6 12:39:26 2011 +0200 finisch core52. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39b14828cabf647dd505a7f5da956c7bb1f98f9e
by git＠ipfire.org 05 Sep '11

05 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 39b14828cabf647dd505a7f5da956c7bb1f98f9e (commit) via b278daf39894ca17e31f76c7f20e641bee419f66 (commit) from 28162d3293a0b33237fda408a79cfe685dd6693a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 39b14828cabf647dd505a7f5da956c7bb1f98f9e Merge: b278daf 28162d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 5 22:57:09 2011 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit b278daf39894ca17e31f76c7f20e641bee419f66 Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Mon Sep 5 22:56:49 2011 +0200 Updates :D ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 262 ++++++++++++++++++++++++++------------------- 1 files changed, 152 insertions(+), 110 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5d4ebff..4409f77 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -552,29 +552,25 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General flock SERVERCONF, 2; print SERVERCONF "# IPFire n2n Open VPN Server Config by ummeegge und m.a.d\n"; print SERVERCONF "\n"; - print SERVERCONF "# User Sicherheit\n"; + print SERVERCONF "# User Security\n"; print SERVERCONF "user nobody\n"; print SERVERCONF "group nobody\n"; print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; print SERVERCONF "script-security 2\n"; - print SERVERCONF "\n"; - print SERVERCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print SERVERCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; - print SERVERCONF "\n"; - print SERVERCONF "# IP Adressen des VPN Tunnels\n"; + print SERVERCONF "float\n"; + print SERVERCONF "# IP address of the n2n VPN Subnet\n"; print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Netzwerk auf dem Client Gateway\n"; + print SERVERCONF "# Client gateway network\n"; print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; - print SERVERCONF "# Device fuer den Tunnel\n"; + print SERVERCONF "# tun device\n"; print SERVERCONF "dev tun\n"; - print SERVERCONF "\n"; - print SERVERCONF "#Port und Protokoll\n"; + print SERVERCONF "#Port and protocol\n"; print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; print SERVERCONF "proto $cgiparams{'PROTOCOL'}\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Paketgroessen\n"; + print SERVERCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; if ($cgiparams{'PROTOCOL'} eq 'udp') { @@ -587,32 +583,26 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "mssfix\n"; } } - print SERVERCONF "\n"; print SERVERCONF "# Auth Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n"; print SERVERCONF "dh ${General::swroot}/ovpn/ca/dh1024.pem\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Verschluesselung\n"; + print SERVERCONF "# Cipher\n"; print SERVERCONF "cipher AES-256-CBC\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print SERVERCONF "# Kompression einschalten\n"; + print SERVERCONF "# Enable compession\n"; print SERVERCONF "comp-lzo\r\n"; - print SERVERCONF "#\n"; - } - print SERVERCONF "# Debug Level setzen\n"; + } + print SERVERCONF "# Debug level\n"; print SERVERCONF "verb 3\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Tunnel Ueberwachung\n"; + print SERVERCONF "# Tunnel check\n"; print SERVERCONF "keepalive 10 60\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Als Daemon starten mit Namen ovpnn2n\n"; + print SERVERCONF "# start as daemon\n"; print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Management Interface aktivieren\n"; + print SERVERCONF "# Activate Management Interface on Port\n"; print SERVERCONF "#management localhost 4711\n"; close(SERVERCONF); @@ -637,29 +627,25 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General flock CLIENTCONF, 2; print CLIENTCONF "# IPFire rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "#\n"; - print CLIENTCONF "# User Sicherheit\n"; + print CLIENTCONF "# User Security\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; + print CLIENTCONF "float\n"; + print CLIENTCONF "# IP address of the n2n VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; + print CLIENTCONF "# Server gateway network\n"; print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; - print CLIENTCONF "# Device fuer den Tunnel\n"; + print CLIENTCONF "# tun device\n"; print CLIENTCONF "dev tun\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "#Port und Protokoll\n"; + print CLIENTCONF "#Port and protocol\n"; print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; print CLIENTCONF "proto $cgiparams{'PROTOCOL'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Paketgroessen\n"; + print CLIENTCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; if ($cgiparams{'PROTOCOL'} eq 'udp') { @@ -672,31 +658,23 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "mssfix\n"; } } - print CLIENTCONF "#\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Verschluesselung\n"; + print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; - print CLIENTCONF "#\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print CLIENTCONF "# Kompression einschalten\n"; + print CLIENTCONF "# Enable compession\n"; print CLIENTCONF "comp-lzo\r\n"; - print CLIENTCONF "#\n"; - } - print CLIENTCONF "#\n"; + } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Tunnel Ueberwachung\n"; + print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Als Daemon starten\n"; + print CLIENTCONF "# Start sa daemon\n"; print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Management Interface aktivieren\n"; + print CLIENTCONF "# Activate Management Interface on Port\n"; print CLIENTCONF "# management localhost 4711\n"; close(CLIENTCONF); @@ -1574,29 +1552,25 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ my $zip = Archive::Zip->new(); print CLIENTCONF "# IPFire n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "# \n"; - print CLIENTCONF "# User Sicherheit\n"; + print CLIENTCONF "# User Security\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; + print CLIENTCONF "float\n"; + print CLIENTCONF "# IP adress of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; + print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; - print CLIENTCONF "# Device fuer den Tunnel\n"; + print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "#Port und Protokoll\n"; + print CLIENTCONF "#Port and Protokoll\n"; print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; print CLIENTCONF "proto $confighash{$cgiparams{'KEY'}}[28]\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Paketgroessen\n"; + print CLIENTCONF "# Paketsize\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { @@ -1609,33 +1583,26 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "mssfix\n"; } } - print CLIENTCONF "#\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Verschluesselung\n"; + print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12\r\n"; $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n"; } - print CLIENTCONF "#\n"; if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') { - print CLIENTCONF "# Kompression einschalten\n"; + print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\r\n"; - print CLIENTCONF "#\n"; - } + } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Tunnel Ueberwachung\n"; + print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Als Daemon starten\n"; + print CLIENTCONF "# Start as daemon\n"; print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Management Interface aktivieren\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; print CLIENTCONF "# management localhost 4711\n"; print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n"; @@ -2209,6 +2176,9 @@ END &Header::openpage($Lang::tr{'vpn configuration main'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'}); + +if ( -s "${General::swroot}/ovpn/settings") { + print <<END <b>$Lang::tr{'connection type'}:</b><br /> <table><form method='post' ENCTYPE="multipart/form-data"> @@ -2224,6 +2194,18 @@ END END ; +} else { + print <<END + <b>$Lang::tr{'connection type'}:</b><br /> + <table><form method='post' ENCTYPE="multipart/form-data"> + <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> + <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + </form></table> +END + ; + +} + &Header::closebox(); &Header::closebigbox(); &Header::closepage(); @@ -2322,6 +2304,8 @@ END } move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name"); + chmod 0600, "${General::swroot}/ovpn/certs/$uplp12name"; + if ($? ne 0) { $errormessage = "$Lang::tr{'certificate file move failed'}: $!"; unlink ($filename); @@ -2357,6 +2341,7 @@ $n2nproto[1] =~ s/\n|\r//g; $n2nport[1] =~ s/\n|\r//g; $n2ntunmtu[1] =~ s/\n|\r//g; $n2nremsub[1] =~ s/\n|\r//g; +$n2nremsub[2] =~ s/\n|\r//g; $n2nlocalsub[2] =~ s/\n|\r//g; $n2nfragment[1] =~ s/\n|\r//g; chomp ($complzoactive); @@ -2373,22 +2358,23 @@ chomp ($mssfixactive); foreach my $dkey (keys %confighash) { if ($confighash{$dkey}[1] eq $n2nname[0]) { $errormessage = $Lang::tr{'a connection with this name already exists'}; + unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; + unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; goto N2N_ERROR; } } ### -# Check if RemSubnet is green orange blue -### - - -### # Check if OpenVPN Subnet is valid ### foreach my $dkey (keys %confighash) { if ($confighash{$dkey}[27] eq "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0") { $errormessage = 'The OpenVPN Subnet is already in use'; + unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; + unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; goto N2N_ERROR; } } @@ -2400,6 +2386,9 @@ foreach my $dkey (keys %confighash) { foreach my $dkey (keys %confighash) { if ($confighash{$dkey}[29] eq $n2nport[1] ) { $errormessage = 'The OpenVPN Port is already in use'; + unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; + unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; goto N2N_ERROR; } } @@ -2417,7 +2406,7 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[6] = 'client'; $confighash{$key}[8] = $n2nlocalsub[2]; $confighash{$key}[10] = $n2nremote[1]; - $confighash{$key}[11] = $n2nremsub[1]; + $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; $confighash{$key}[25] = 'IPFire n2n Client'; @@ -2562,22 +2551,38 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } if ($cgiparams{'NAME'} !~ /^[a-zA-Z0-9]+$/) { $errormessage = $Lang::tr{'name must only contain characters'}; - goto VPNCONF_ERROR; - } + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } + goto VPNCONF_ERROR; + } if ($cgiparams{'NAME'} =~ /^(host|01|block|private|clear|packetdefault)$/) { $errormessage = $Lang::tr{'name is invalid'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } if (length($cgiparams{'NAME'}) >60) { $errormessage = $Lang::tr{'name too long'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } @@ -2589,37 +2594,51 @@ if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; - goto VPNCONF_ERROR; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ($cgiparams{'OVPN_SUBNET'} eq $vpnsettings{'DOVPN_SUBNET'}) { $errormessage = 'The OpenVPN Subnet is used by the OpenVPN Server please change'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) { $errormessage = 'mssfix only allowed with udp'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) { $errormessage = 'fragment only allowed with udp'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { - $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; - goto VPNCONF_ERROR; + $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { - $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; - goto VPNCONF_ERROR; + $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { - $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; - goto VPNCONF_ERROR; + $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } } @@ -2633,6 +2652,10 @@ if ($cgiparams{'TYPE'} eq 'net') { foreach my $key (keys %confighash) { if ($confighash{$key}[1] eq $cgiparams{'NAME'}) { $errormessage = $Lang::tr{'a connection with this name already exists'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } } @@ -2640,6 +2663,10 @@ if ($cgiparams{'TYPE'} eq 'net') { if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) { $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } @@ -2647,10 +2674,18 @@ if ($cgiparams{'TYPE'} eq 'net') { if (! &General::validip($cgiparams{'REMOTE'})) { if (! &General::validfqdn ($cgiparams{'REMOTE'})) { $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } else { if (&valid_dns_host($cgiparams{'REMOTE'})) { $warnmessage = "$Lang::tr{'check vpn lr'} $cgiparams{'REMOTE'}. $Lang::tr{'dns check failed'}"; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } } } } @@ -2658,6 +2693,10 @@ if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'TYPE'} ne 'host') { unless (&General::validipandmask($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'local subnet is invalid'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR;} } # Check if there is no other entry without IP-address and PSK @@ -2673,7 +2712,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) { $errormessage = $Lang::tr{'remote subnet is invalid'}; - goto VPNCONF_ERROR; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { @@ -3655,24 +3696,9 @@ END ### # m.a.d net2net -### - - my $cn; - my @match = (); - foreach my $line (@status) { - chomp($line); - if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { - @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); - if ($match[1] ne "Common Name") { - $cn = $match[1]; - } - $cn =~ s/[_]/ /g; - if ($cn eq "$confighash{$key}[2]") { - $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>"; - } - - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { - +### + + if ($confighash{$key}[3] eq 'net') { my @tempovpnsubnet = split("\/",$confighash{$key}[27]); my @ovpnip = split /\./,$tempovpnsubnet[0]; my $pingip = ""; @@ -3691,6 +3717,22 @@ END $p->close(); } + + my $cn; + my @match = (); + foreach my $line (@status) { + chomp($line); + if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { + @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); + if ($match[1] ne "Common Name") { + $cn = $match[1]; + } + $cn =~ s/[_]/ /g; + if ($cn eq "$confighash{$key}[2]") { + $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>"; + } + + } } } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 28162d3293a0b33237fda408a79cfe685dd6693a
by git＠ipfire.org 05 Sep '11

05 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 28162d3293a0b33237fda408a79cfe685dd6693a (commit) via 527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b (commit) from c75f5126071dec23b877875feb8beb2c6c59de46 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 28162d3293a0b33237fda408a79cfe685dd6693a Merge: c75f512 527a5a7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 5 20:35:02 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 36 +++++++++++++++--------------- config/rootfiles/core/52/filelists/files | 1 + langs/de/cgi-bin/de.pl | 5 ++++ langs/en/cgi-bin/en.pl | 5 ++++ langs/es/cgi-bin/es.pl | 5 ++++ langs/fr/cgi-bin/fr.pl | 5 ++++ langs/pl/cgi-bin/pl.pl | 5 ++++ langs/ru/cgi-bin/ru.pl | 18 +++++--------- 8 files changed, 51 insertions(+), 29 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 8d047c2..c51e882 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -116,7 +116,7 @@ sub updatecpugraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -249,7 +249,7 @@ sub updateloadgraph { "-h 125", "-l 0", "-r", - "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'processes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -288,7 +288,7 @@ sub updatememorygraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -350,7 +350,7 @@ sub updateswapgraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -407,7 +407,7 @@ sub updateprocessescpugraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"} @@ -457,7 +457,7 @@ sub updateprocessesmemorygraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -503,7 +503,7 @@ sub updatediskgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -553,7 +553,7 @@ sub updateifgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -597,7 +597,7 @@ sub updatefwhitsgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -645,7 +645,7 @@ sub updatepinggraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ms", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -689,7 +689,7 @@ sub updatewirelessgraph { "--alt-y-grid", "-w 600", "-h 125", - "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v dBm", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -733,7 +733,7 @@ sub updatehddgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -773,7 +773,7 @@ sub updatehwtempgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -826,7 +826,7 @@ sub updatehwfangraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -879,7 +879,7 @@ sub updatehwvoltgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -952,7 +952,7 @@ sub updateqosgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1010,7 +1010,7 @@ sub updatecpufreqgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"}, "-v MHz", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1055,7 +1055,7 @@ sub updatethermaltempgraph { "-w 600", "-h 125", "-r", - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period}, + "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, "-v Grad Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index a0f0ef5..8076e02 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -5,3 +5,4 @@ usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/graphs.pl diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0d73e61..f7aef31 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -551,6 +551,7 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', +'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', 'days' => 'Tage', @@ -903,6 +904,7 @@ 'hosts config added' => 'Hosts-Konfiguration hinzugefügt', 'hosts config changed' => 'Hosts-Konfiguration geändert', 'hour' => 'Stunde', +'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', 'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.', @@ -1180,6 +1182,7 @@ 'modulation' => 'Modulation', 'monday' => 'Montag', 'month' => 'Monat', +'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', 'monthly start day bad' => 'Monatlicher Starttag ist nicht gültig', 'monthly traffic bad' => 'Monatliches Volumen ist nicht gültig', @@ -2116,6 +2119,7 @@ 'website' => 'Website', 'wednesday' => 'Mittwoch', 'week' => 'Woche', +'week-graph' => 'Woche', 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', @@ -2151,6 +2155,7 @@ 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!', 'year' => 'Jahr', +'year-graph' => 'Jahr', 'yearly firewallhits' => 'jährliche Firewalltreffer', 'yes' => 'Ja', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.<br/>Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e18fc53..62925ce 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -572,6 +572,7 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', +'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', 'days' => 'days.', @@ -929,6 +930,7 @@ 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', 'hour' => 'Hour', +'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1207,6 +1209,7 @@ 'modulation' => 'Modulation', 'monday' => 'Monday', 'month' => 'Month', +'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', 'monthly start day bad' => 'Monthly start day is not correct', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2150,6 +2153,7 @@ 'website' => 'Website', 'wednesday' => 'Wednesday', 'week' => 'Week', +'week-graph' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', 'wildcards' => 'Wildcards', @@ -2185,6 +2189,7 @@ 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !', 'year' => 'Year', +'year-graph' => 'Year', 'yearly firewallhits' => 'yearly firewallhits', 'yes' => 'Yes', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 4093809..d410a56 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -570,6 +570,7 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', +'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', 'days' => 'dias.', @@ -910,6 +911,7 @@ 'hosts config added' => 'Configuración de hosts agregada', 'hosts config changed' => 'Configuración de hosts ha cambiado', 'hour' => 'Hora', +'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', 'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual', @@ -1187,6 +1189,7 @@ 'modulation' => 'Modulación', 'monday' => 'Lun', 'month' => 'Mes', +'month-graph' => 'Mes', 'monthly firewallhits' => 'Hits al firewall mensuales', 'monthly start day bad' => 'Fecha de inicio mensual incorrecta', 'monthly traffic bad' => 'Volúmen mensual incorrecto', @@ -2114,6 +2117,7 @@ 'website' => 'Website', 'wednesday' => 'Miércoles', 'week' => 'Semana', +'week-graph' => 'Semana', 'weekly firewallhits' => 'Hits semanales al firewall', 'weeks' => 'Semanas', 'wildcards' => 'Comodines', @@ -2149,6 +2153,7 @@ 'xtaccess all error' => 'No puede establecer un acceso externo para TODOS, eso se hace en el registro de reenvío-de-puertos.', 'xtaccess bad transfert' => '¡Si ud. especifica un rango de puerto de destino, el rango de origen debe ser idéntico!', 'year' => 'Año', +'year-graph' => 'Ano', 'yearly firewallhits' => 'Hits anuales al Firewall', 'yes' => 'Si', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Solamente puede definir una conexion Roadwarrior cuando utiliza una autenticación por llave pre-compartida.<br />Puede ser que ya cuente con una conexión Roadwarrior abierta con autenticación por llave pre-compartida, o ud está intentando añadir una nueva ahora', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 69e8ba1..daeb9f2 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -572,6 +572,7 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', +'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', 'days' => 'jours.', @@ -911,6 +912,7 @@ 'hosts config added' => 'configuration de l\'hôte ajoutée', 'hosts config changed' => 'configuration de l\'hôte changée', 'hour' => 'Heure', +'hour-graph' => 'Heure', 'hours' => 'heures', 'hours2' => 'Heures', 'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.', @@ -1188,6 +1190,7 @@ 'modulation' => 'Modulation', 'monday' => 'Lundi', 'month' => 'Mois', +'month-graph' => 'Mois', 'monthly firewallhits' => 'Attaques mensuelle du pare-feu', 'monthly start day bad' => 'Le jour de début du mois est incorrect', 'monthly traffic bad' => 'Le trafic mensuel est incorrect', @@ -2124,6 +2127,7 @@ 'website' => 'Site Web', 'wednesday' => 'Mercredi', 'week' => 'Semaine', +'week-graph' => 'Semaine', 'weekly firewallhits' => 'Hits hebdomadaire du pare-feu', 'weeks' => 'semaines', 'wildcards' => 'Jokers', @@ -2139,6 +2143,7 @@ 'xtaccess all error' => 'Vous ne pouvez pas donner l\'accès externe à tout ce qui se fait dans le dossier de redirection de port.', 'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !', 'year' => 'Année', +'year-graph' => 'Annee', 'yearly firewallhits' => 'Hits annuels du pare-feu', 'yes' => 'Oui', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion roadwarrior lors de l\'utilisation par pré-authentification par clé partagée.<br />Soit vous avez déjà une connexion RoadWarrior avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index be4f5ea..14160de 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -572,6 +572,7 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', +'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', 'days' => 'dni.', @@ -920,6 +921,7 @@ 'hosts config added' => 'Dodana konfiguracja hostów', 'hosts config changed' => 'Zmieniona konfiguracja hostów', 'hour' => 'Godzina', +'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1197,6 +1199,7 @@ 'modulation' => 'Modulacja', 'monday' => 'Poniedziałek', 'month' => 'Miesiac', +'month-graph' => 'Miesiac', 'monthly firewallhits' => 'miesięczne zdarzenia zapory', 'monthly start day bad' => 'Początek okresu miesięcznego jest niepoprawny', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2138,6 +2141,7 @@ 'website' => 'Stron WWW', 'wednesday' => 'Środa', 'week' => 'Tydzien', +'week-graph' => 'Tydzien', 'weekly firewallhits' => 'zdarzeń zapory tygodniowo', 'weeks' => 'tygodnie', 'wildcards' => 'Maski', @@ -2173,6 +2177,7 @@ 'xtaccess all error' => 'Nie możesz ustawić zdalnego dostępu dla wszystkich - to robi wpis przekierowujący porty.', 'xtaccess bad transfert' => 'Jeżeli określisz zakres portów docelowy musisz ustawić identyczny zakres portów źródłowych !', 'year' => 'Rok', +'year-graph' => 'Rok', 'yearly firewallhits' => 'zdarzeń zapory w toku', 'yes' => 'Tak', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Możesz zdefiniować tylko jedno połączenie typu Roadwarrior jeżeli używasz autentykacji kluczem współdzielony (pre-shared key).<br />Albo połączenie typu Roadwarrior uwierzytelniane kluczem współdzielonym już istnieje, albo próbujesz dodać je teraz.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 946e302..18c1349 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -550,7 +550,7 @@ 'credits' => 'О Проекте', 'crl' => 'Список отозванных сертификатов', 'cron server' => 'CRON Сервер', -'current' => 'Текущий', +'current' => 'Current', 'current aliases' => 'Действующие псевдонимы:', 'current class' => 'Текущий класс', 'current devices' => 'Текущие устройства', @@ -569,7 +569,7 @@ 'dat without key' => 'Зашифрованный архив не может быть использован без ключа.', 'date' => 'Дата', 'date not in logs' => 'На запрошеный день журналы не найдены или они частично недоступны', -'day' => 'Day', +'day' => 'Сутки', 'day after' => 'Следующий День', 'day before' => 'Предыдущий День', 'days' => 'Дни.', @@ -655,7 +655,6 @@ 'disabled' => 'отключён', 'disconnect' => 'OVPN Остановить / Отключить', 'disconnects' => 'Отключает', -'disk access per' => 'Доступ к диску по', 'disk usage' => 'Использование дисков', 'display' => 'Экран', 'display charset' => 'Таблица символов', @@ -844,9 +843,8 @@ 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', 'free' => 'Свободно', -'free memory' => 'Свободно Памяти ', -'free swap' => 'Свободно Swap', -'frequency' => 'Частота', +'free memory' => 'Free memory', +'free swap' => 'Free Swap', 'friday' => 'Пятница', 'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire website and then upload the entire <b>fcdsl-(your_version).tgz</b> using the form below.', 'fritzdsl upload' => 'Upload Fritz!DSL driver', @@ -948,7 +946,6 @@ 'inactive' => 'inactive', 'include logfiles' => 'Включить файлы логов', 'incoming' => 'Входящий', -'incoming traffic in bytes per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', @@ -1151,7 +1148,7 @@ 'max retries not set' => 'Не указано максимальное число попыток.', 'max size' => 'Максимальный размер объекта (KB):', 'max throughput' => 'Максимальная пропускная способность', -'maximal' => 'Максимум', +'maximal' => 'Maximal', 'maximum retries' => 'Максимальное число попыток:', 'may' => 'Май', 'mbmon display' => 'Показать', @@ -1339,7 +1336,6 @@ 'outgoing firewall reset' => 'Сбросить всё', 'outgoing firewall view group' => 'Посмотреть группу', 'outgoing firewall warning' => 'Если не указывать ip или mac, то они будут игнорироваться', -'outgoing traffic in bytes per second' => 'Исходящий трафик', 'override mtu' => 'Перезаписать MTU по умолчанию', 'ovpn' => 'OpenVPN', 'ovpn con stat' => 'Статистика подключений OpenVPN', @@ -2081,8 +2077,8 @@ 'use ipfire red ip' => 'Для подключения IPFire использует классический RED IP', 'use only proposed settings' => 'Пожалуйста используйте только предлагаемые настройки.', 'used' => 'Использовано', -'used memory' => 'Использовано памяти ', -'used swap' => 'Использовано Swap', +'used memory' => 'Used memory', +'used swap' => 'Used swap', 'user' => 'Пользователь', 'user log' => 'Журнал пользователя', 'user proxy logs' => 'Журнал proxy пользователя', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b
by git＠ipfire.org 05 Sep '11

05 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b (commit) from fd4f39f210c9555a0708af20e316f3d773d6b99b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 5 20:32:02 2011 +0200 graphs/langs: fix graphs with russian language. rrd-graph cannot use UTF-8 chars so the strings are duplicated. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 36 +++++++++++++++--------------- config/rootfiles/core/52/filelists/files | 1 + langs/de/cgi-bin/de.pl | 5 ++++ langs/en/cgi-bin/en.pl | 5 ++++ langs/es/cgi-bin/es.pl | 5 ++++ langs/fr/cgi-bin/fr.pl | 5 ++++ langs/pl/cgi-bin/pl.pl | 5 ++++ langs/ru/cgi-bin/ru.pl | 18 +++++--------- 8 files changed, 51 insertions(+), 29 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 8d047c2..c51e882 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -116,7 +116,7 @@ sub updatecpugraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -249,7 +249,7 @@ sub updateloadgraph { "-h 125", "-l 0", "-r", - "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'processes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -288,7 +288,7 @@ sub updatememorygraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -350,7 +350,7 @@ sub updateswapgraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -407,7 +407,7 @@ sub updateprocessescpugraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"} @@ -457,7 +457,7 @@ sub updateprocessesmemorygraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -503,7 +503,7 @@ sub updatediskgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -553,7 +553,7 @@ sub updateifgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -597,7 +597,7 @@ sub updatefwhitsgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -645,7 +645,7 @@ sub updatepinggraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ms", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -689,7 +689,7 @@ sub updatewirelessgraph { "--alt-y-grid", "-w 600", "-h 125", - "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v dBm", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -733,7 +733,7 @@ sub updatehddgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -773,7 +773,7 @@ sub updatehwtempgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -826,7 +826,7 @@ sub updatehwfangraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -879,7 +879,7 @@ sub updatehwvoltgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -952,7 +952,7 @@ sub updateqosgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1010,7 +1010,7 @@ sub updatecpufreqgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"}, "-v MHz", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1055,7 +1055,7 @@ sub updatethermaltempgraph { "-w 600", "-h 125", "-r", - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period}, + "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, "-v Grad Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index a0f0ef5..8076e02 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -5,3 +5,4 @@ usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/graphs.pl diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e6d451f..6a9e04b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -549,6 +549,7 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', +'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', 'days' => 'Tage', @@ -892,6 +893,7 @@ 'hosts config added' => 'Hosts-Konfiguration hinzugefügt', 'hosts config changed' => 'Hosts-Konfiguration geändert', 'hour' => 'Stunde', +'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', 'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.', @@ -1169,6 +1171,7 @@ 'modulation' => 'Modulation', 'monday' => 'Montag', 'month' => 'Monat', +'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', 'monthly start day bad' => 'Monatlicher Starttag ist nicht gültig', 'monthly traffic bad' => 'Monatliches Volumen ist nicht gültig', @@ -2103,6 +2106,7 @@ 'website' => 'Website', 'wednesday' => 'Mittwoch', 'week' => 'Woche', +'week-graph' => 'Woche', 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', @@ -2138,6 +2142,7 @@ 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!', 'year' => 'Jahr', +'year-graph' => 'Jahr', 'yearly firewallhits' => 'jährliche Firewalltreffer', 'yes' => 'Ja', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.<br/>Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 2478145..041659b 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -570,6 +570,7 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', +'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', 'days' => 'days.', @@ -918,6 +919,7 @@ 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', 'hour' => 'Hour', +'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1196,6 +1198,7 @@ 'modulation' => 'Modulation', 'monday' => 'Monday', 'month' => 'Month', +'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', 'monthly start day bad' => 'Monthly start day is not correct', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2137,6 +2140,7 @@ 'website' => 'Website', 'wednesday' => 'Wednesday', 'week' => 'Week', +'week-graph' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', 'wildcards' => 'Wildcards', @@ -2172,6 +2176,7 @@ 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !', 'year' => 'Year', +'year-graph' => 'Year', 'yearly firewallhits' => 'yearly firewallhits', 'yes' => 'Yes', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 861ff2a..0433ed5 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -568,6 +568,7 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', +'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', 'days' => 'dias.', @@ -899,6 +900,7 @@ 'hosts config added' => 'Configuración de hosts agregada', 'hosts config changed' => 'Configuración de hosts ha cambiado', 'hour' => 'Hora', +'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', 'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual', @@ -1176,6 +1178,7 @@ 'modulation' => 'Modulación', 'monday' => 'Lun', 'month' => 'Mes', +'month-graph' => 'Mes', 'monthly firewallhits' => 'Hits al firewall mensuales', 'monthly start day bad' => 'Fecha de inicio mensual incorrecta', 'monthly traffic bad' => 'Volúmen mensual incorrecto', @@ -2103,6 +2106,7 @@ 'website' => 'Website', 'wednesday' => 'Miércoles', 'week' => 'Semana', +'week-graph' => 'Semana', 'weekly firewallhits' => 'Hits semanales al firewall', 'weeks' => 'Semanas', 'wildcards' => 'Comodines', @@ -2138,6 +2142,7 @@ 'xtaccess all error' => 'No puede establecer un acceso externo para TODOS, eso se hace en el registro de reenvío-de-puertos.', 'xtaccess bad transfert' => '¡Si ud. especifica un rango de puerto de destino, el rango de origen debe ser idéntico!', 'year' => 'Año', +'year-graph' => 'Ano', 'yearly firewallhits' => 'Hits anuales al Firewall', 'yes' => 'Si', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Solamente puede definir una conexion Roadwarrior cuando utiliza una autenticación por llave pre-compartida.<br />Puede ser que ya cuente con una conexión Roadwarrior abierta con autenticación por llave pre-compartida, o ud está intentando añadir una nueva ahora', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 778d9d5..cbdeda4 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -570,6 +570,7 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', +'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', 'days' => 'jours.', @@ -900,6 +901,7 @@ 'hosts config added' => 'configuration de l\'hôte ajoutée', 'hosts config changed' => 'configuration de l\'hôte changée', 'hour' => 'Heure', +'hour-graph' => 'Heure', 'hours' => 'heures', 'hours2' => 'Heures', 'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.', @@ -1177,6 +1179,7 @@ 'modulation' => 'Modulation', 'monday' => 'Lundi', 'month' => 'Mois', +'month-graph' => 'Mois', 'monthly firewallhits' => 'Attaques mensuelle du pare-feu', 'monthly start day bad' => 'Le jour de début du mois est incorrect', 'monthly traffic bad' => 'Le trafic mensuel est incorrect', @@ -2113,6 +2116,7 @@ 'website' => 'Site Web', 'wednesday' => 'Mercredi', 'week' => 'Semaine', +'week-graph' => 'Semaine', 'weekly firewallhits' => 'Hits hebdomadaire du pare-feu', 'weeks' => 'semaines', 'wildcards' => 'Jokers', @@ -2128,6 +2132,7 @@ 'xtaccess all error' => 'Vous ne pouvez pas donner l\'accès externe à tout ce qui se fait dans le dossier de redirection de port.', 'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !', 'year' => 'Année', +'year-graph' => 'Annee', 'yearly firewallhits' => 'Hits annuels du pare-feu', 'yes' => 'Oui', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion roadwarrior lors de l\'utilisation par pré-authentification par clé partagée.<br />Soit vous avez déjà une connexion RoadWarrior avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 4359984..76c49bb 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -570,6 +570,7 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', +'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', 'days' => 'dni.', @@ -918,6 +919,7 @@ 'hosts config added' => 'Dodana konfiguracja hostów', 'hosts config changed' => 'Zmieniona konfiguracja hostów', 'hour' => 'Godzina', +'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1195,6 +1197,7 @@ 'modulation' => 'Modulacja', 'monday' => 'Poniedziałek', 'month' => 'Miesiac', +'month-graph' => 'Miesiac', 'monthly firewallhits' => 'miesięczne zdarzenia zapory', 'monthly start day bad' => 'Początek okresu miesięcznego jest niepoprawny', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2136,6 +2139,7 @@ 'website' => 'Stron WWW', 'wednesday' => 'Środa', 'week' => 'Tydzien', +'week-graph' => 'Tydzien', 'weekly firewallhits' => 'zdarzeń zapory tygodniowo', 'weeks' => 'tygodnie', 'wildcards' => 'Maski', @@ -2171,6 +2175,7 @@ 'xtaccess all error' => 'Nie możesz ustawić zdalnego dostępu dla wszystkich - to robi wpis przekierowujący porty.', 'xtaccess bad transfert' => 'Jeżeli określisz zakres portów docelowy musisz ustawić identyczny zakres portów źródłowych !', 'year' => 'Rok', +'year-graph' => 'Rok', 'yearly firewallhits' => 'zdarzeń zapory w toku', 'yes' => 'Tak', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Możesz zdefiniować tylko jedno połączenie typu Roadwarrior jeżeli używasz autentykacji kluczem współdzielony (pre-shared key).<br />Albo połączenie typu Roadwarrior uwierzytelniane kluczem współdzielonym już istnieje, albo próbujesz dodać je teraz.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 946e302..18c1349 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -550,7 +550,7 @@ 'credits' => 'О Проекте', 'crl' => 'Список отозванных сертификатов', 'cron server' => 'CRON Сервер', -'current' => 'Текущий', +'current' => 'Current', 'current aliases' => 'Действующие псевдонимы:', 'current class' => 'Текущий класс', 'current devices' => 'Текущие устройства', @@ -569,7 +569,7 @@ 'dat without key' => 'Зашифрованный архив не может быть использован без ключа.', 'date' => 'Дата', 'date not in logs' => 'На запрошеный день журналы не найдены или они частично недоступны', -'day' => 'Day', +'day' => 'Сутки', 'day after' => 'Следующий День', 'day before' => 'Предыдущий День', 'days' => 'Дни.', @@ -655,7 +655,6 @@ 'disabled' => 'отключён', 'disconnect' => 'OVPN Остановить / Отключить', 'disconnects' => 'Отключает', -'disk access per' => 'Доступ к диску по', 'disk usage' => 'Использование дисков', 'display' => 'Экран', 'display charset' => 'Таблица символов', @@ -844,9 +843,8 @@ 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', 'free' => 'Свободно', -'free memory' => 'Свободно Памяти ', -'free swap' => 'Свободно Swap', -'frequency' => 'Частота', +'free memory' => 'Free memory', +'free swap' => 'Free Swap', 'friday' => 'Пятница', 'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire website and then upload the entire <b>fcdsl-(your_version).tgz</b> using the form below.', 'fritzdsl upload' => 'Upload Fritz!DSL driver', @@ -948,7 +946,6 @@ 'inactive' => 'inactive', 'include logfiles' => 'Включить файлы логов', 'incoming' => 'Входящий', -'incoming traffic in bytes per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', @@ -1151,7 +1148,7 @@ 'max retries not set' => 'Не указано максимальное число попыток.', 'max size' => 'Максимальный размер объекта (KB):', 'max throughput' => 'Максимальная пропускная способность', -'maximal' => 'Максимум', +'maximal' => 'Maximal', 'maximum retries' => 'Максимальное число попыток:', 'may' => 'Май', 'mbmon display' => 'Показать', @@ -1339,7 +1336,6 @@ 'outgoing firewall reset' => 'Сбросить всё', 'outgoing firewall view group' => 'Посмотреть группу', 'outgoing firewall warning' => 'Если не указывать ip или mac, то они будут игнорироваться', -'outgoing traffic in bytes per second' => 'Исходящий трафик', 'override mtu' => 'Перезаписать MTU по умолчанию', 'ovpn' => 'OpenVPN', 'ovpn con stat' => 'Статистика подключений OpenVPN', @@ -2081,8 +2077,8 @@ 'use ipfire red ip' => 'Для подключения IPFire использует классический RED IP', 'use only proposed settings' => 'Пожалуйста используйте только предлагаемые настройки.', 'used' => 'Использовано', -'used memory' => 'Использовано памяти ', -'used swap' => 'Использовано Swap', +'used memory' => 'Used memory', +'used swap' => 'Used swap', 'user' => 'Пользователь', 'user log' => 'Журнал пользователя', 'user proxy logs' => 'Журнал proxy пользователя', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c75f5126071dec23b877875feb8beb2c6c59de46
by git＠ipfire.org 05 Sep '11

05 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c75f5126071dec23b877875feb8beb2c6c59de46 (commit) via 7c0fce586f18ab3df70de1138f85b5bfc72e1a6e (commit) via fd4f39f210c9555a0708af20e316f3d773d6b99b (commit) via 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a (commit) from 32e754c1b2572ff4d4312c83d0fc72bd791a11af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c75f5126071dec23b877875feb8beb2c6c59de46 Merge: 7c0fce5 32e754c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 5 16:43:42 2011 +0200 Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next commit 7c0fce586f18ab3df70de1138f85b5bfc72e1a6e Merge: 6dd8a47 fd4f39f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 5 16:43:15 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/52/filelists/files | 1 + config/rootfiles/core/{50 => 52}/filelists/squid | 0 html/cgi-bin/proxy.cgi | 1 + lfs/squid | 4 ++-- 4 files changed, 4 insertions(+), 2 deletions(-) copy config/rootfiles/core/{50 => 52}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index 331514d..a0f0ef5 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -4,3 +4,4 @@ etc/rc.d/init.d/console usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/52/filelists/squid b/config/rootfiles/core/52/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/52/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a0aa1ac..6d0fe54 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3147,6 +3147,7 @@ END if ($proxysettings{'AUTH_METHOD'} eq 'ldap') { + print FILE "auth_param basic utf8 on\n"; print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\""; if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; } if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; } diff --git a/lfs/squid b/lfs/squid index f85b5e9..a29109f 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.14 +VER = 3.1.15 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd +$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fd4f39f210c9555a0708af20e316f3d773d6b99b
by git＠ipfire.org 05 Sep '11

05 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via fd4f39f210c9555a0708af20e316f3d773d6b99b (commit) from 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fd4f39f210c9555a0708af20e316f3d773d6b99b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 5 16:41:53 2011 +0200 squid: update to 3.1.15. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{50 => 52}/filelists/squid | 0 lfs/squid | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/core/{50 => 52}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/52/filelists/squid b/config/rootfiles/core/52/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/52/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index f85b5e9..a29109f 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.14 +VER = 3.1.15 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd +$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a
by git＠ipfire.org 05 Sep '11

05 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a (commit) from 5de6ca7829b163bbea10ba3ab1b1587b81ac1198 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 5 11:29:08 2011 +0200 proxy.cgi: fix ldap utf8 authentification. Fixes: #786 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/52/filelists/files | 1 + html/cgi-bin/proxy.cgi | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index 331514d..a0f0ef5 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -4,3 +4,4 @@ etc/rc.d/init.d/console usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a0aa1ac..6d0fe54 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3147,6 +3147,7 @@ END if ($proxysettings{'AUTH_METHOD'} eq 'ldap') { + print FILE "auth_param basic utf8 on\n"; print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\""; if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; } if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 32e754c1b2572ff4d4312c83d0fc72bd791a11af
by git＠ipfire.org 04 Sep '11

04 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 32e754c1b2572ff4d4312c83d0fc72bd791a11af (commit) via 2d20dff23384811c321511e88963c060b2ba4109 (commit) via d4f2fb979aa347d6b819e3d6476162b4ba29f086 (commit) via 7c1d9faf271a1aa8289a8ed16e896d7ed6c519b5 (commit) from 6dd8a471e4c9227221b85babd826ef216bf1b932 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 32e754c1b2572ff4d4312c83d0fc72bd791a11af Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 4 21:18:01 2011 +0200 Create folder that keeps the openvpn daemon configuration files. commit 2d20dff23384811c321511e88963c060b2ba4109 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 4 21:14:57 2011 +0200 Add openvpn update to core update. commit d4f2fb979aa347d6b819e3d6476162b4ba29f086 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 4 20:37:49 2011 +0200 openvpnctrl: Fix adding firewall rules. commit 7c1d9faf271a1aa8289a8ed16e896d7ed6c519b5 Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Sun Sep 4 17:57:47 2011 +0200 Bugfixes on OpenVPN CGI. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openvpn | 1 + config/rootfiles/core/next/filelists/openvpn | 1 + html/cgi-bin/ovpnmain.cgi | 135 +++++++++++++++----------- lfs/openvpn | 1 + src/misc-progs/openvpnctrl.c | 27 ++++-- 5 files changed, 103 insertions(+), 62 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/openvpn Difference in files: diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 8791523..0f2aa47 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -11,6 +11,7 @@ var/ipfire/ovpn/caconfig var/ipfire/ovpn/certs/index.txt var/ipfire/ovpn/certs/serial var/ipfire/ovpn/crls +var/ipfire/ovpn/n2nconf #var/ipfire/ovpn/openssl var/ipfire/ovpn/openssl/ovpn.cnf var/ipfire/ovpn/ovpn-leases.db diff --git a/config/rootfiles/core/next/filelists/openvpn b/config/rootfiles/core/next/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/next/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 95eb67a..5d4ebff 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -397,6 +397,22 @@ sub emptyserverlog{ } +### +# m.a.d net2net +### + +sub validdotmask +{ + my $ipdotmask = $_[0]; + if (&General::validip($ipdotmask)) { return 0; } + if (!($ipdotmask =~ /^(.*?)\/(.*?)$/)) { } + my $mask = $2; + if (($mask =~ /\./ )) { return 0; } + return 1; +} + + + #hier die refresh page if ( -e "${General::swroot}/ovpn/gencanow") { my $refresh = ''; @@ -517,7 +533,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { } ### -# m.a.d Save net2net server config +# m.a.d net2net ### if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'server') @@ -534,13 +550,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General open(SERVERCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; flock SERVERCONF, 2; - print SERVERCONF "# n2n Open VPN Server Config by ummeegge und m.a.d\n"; + print SERVERCONF "# IPFire n2n Open VPN Server Config by ummeegge und m.a.d\n"; print SERVERCONF "\n"; print SERVERCONF "# User Sicherheit\n"; print SERVERCONF "user nobody\n"; print SERVERCONF "group nobody\n"; print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; + print SERVERCONF "script-security 2\n"; print SERVERCONF "\n"; print SERVERCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; @@ -602,8 +619,9 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } ### -# m.a.d Save net2net client config +# m.a.d net2net ### + if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client') { my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); @@ -617,13 +635,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General open(CLIENTCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; flock CLIENTCONF, 2; - print CLIENTCONF "# rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; + print CLIENTCONF "# IPFire rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# User Sicherheit\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; + print CLIENTCONF "script-security 2\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; @@ -632,7 +651,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; - print CLIENTCONF "route @remsubnet[0]/@remsubnet[1]\n"; + print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; print CLIENTCONF "# Device fuer den Tunnel\n"; print CLIENTCONF "dev tun\n"; print CLIENTCONF "#\n"; @@ -684,10 +703,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } ### -# m.a.d Save net2net config end -### - -### ### Save main settings ### @@ -1488,7 +1503,7 @@ END ### ### -# m.a.d net2net Anpassung +# m.a.d net2net ### }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { @@ -1540,8 +1555,8 @@ END my $zippath = "$tempdir/"; ### -# m.a.d net2net DL Client Package -### +# m.a.d net2net +### if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ @@ -1551,18 +1566,20 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ my @ovsubnettemp = split(/\./,$confighash{$cgiparams{'KEY'}}[27]); my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; my $tunmtu = ''; + my @remsubnet = split(/\//,$confighash{$cgiparams{'KEY'}}[8]); open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; my $zip = Archive::Zip->new(); - print CLIENTCONF "# n2n Open VPN Client Config by ummeegge und m.a.d\n"; + print CLIENTCONF "# IPFire n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "# \n"; print CLIENTCONF "# User Sicherheit\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; + print CLIENTCONF "script-security 2\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; @@ -1571,7 +1588,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; - print CLIENTCONF "route $confighash{$cgiparams{'KEY'}}[8]\n"; + print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# Device fuer den Tunnel\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; print CLIENTCONF "#\n"; @@ -1642,7 +1659,7 @@ else $clientovpn = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.ovpn"; ### -# m.a.d net2net DL Client Package end +# m.a.d net2net ### open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; @@ -1732,8 +1749,9 @@ else my $temp = `/usr/bin/openssl ca -revoke ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; ### -# m.a.d net2net Anpassung +# m.a.d net2net ### + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); @@ -1743,9 +1761,6 @@ else rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; } -### -# m.a.d net2net Anpassung end -### unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); @@ -2185,7 +2200,7 @@ END ### ### -# m.a.d Anpassung wegen upload n2n Package +# m.a.d net2net ### } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') { @@ -2215,7 +2230,7 @@ END exit (0); ### -# m.a.d uploading a IPFire n2n Client package +# m.a.d net2net ### } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) && ($cgiparams{'TYPE'} eq 'net2net')){ @@ -2288,15 +2303,15 @@ END goto N2N_ERROR; } -### -# m.a.d prepare imported ipfire net2net data +### +# m.a.d net2net ### my @n2nname = split(/\./,$uplconffilename); $n2nname[0] =~ s/\n|\r//g; - if ( !-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]") { - mkdir("${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770); } + unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} + unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename"); @@ -2348,7 +2363,7 @@ chomp ($complzoactive); chomp ($mssfixactive); ### -# m.a.d Write n2n config +# m.a.d net2net ### ### @@ -2446,6 +2461,8 @@ foreach my $dkey (keys %confighash) { <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td><td><b>$confighash{$key}[28]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'destination port'}:</td><td><b>$confighash{$key}[29]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td><td><b>$confighash{$key}[30]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>MSSFIX </td><td><b>$confighash{$key}[23]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>Fragment </td><td><b>$confighash{$key}[24]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr> <tr><td> </td><td> </td></tr> </table> @@ -2497,7 +2514,7 @@ if ($confighash{$cgiparams{'KEY'}}) { ### -# m.a.d end uploading a IPFire n2n Client package +# m.a.d net2net ### @@ -2565,10 +2582,12 @@ if ($confighash{$cgiparams{'KEY'}}) { } ### -# n2n Plausi m.a.d +# m.a.d net2net ### - if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { +if ($cgiparams{'TYPE'} eq 'net') { + + if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; goto VPNCONF_ERROR; } @@ -2587,11 +2606,22 @@ if ($confighash{$cgiparams{'KEY'}}) { $errormessage = 'fragment only allowed with udp'; goto VPNCONF_ERROR; } - -### -# n2n Plausi m.a.d -### + if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { + $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + goto VPNCONF_ERROR; + } + + if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { + $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + goto VPNCONF_ERROR; + } + + if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { + $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + goto VPNCONF_ERROR; + } +} # if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { # $errormessage = $Lang::tr{'ipfire side is invalid'}; @@ -3169,7 +3199,7 @@ END ; ### -# m.a.d Disbale upload cert for n2n connections +# m.a.d net2net ### } else { @@ -3192,7 +3222,7 @@ END } ### -# m.a.d Disbale upload cert for n2n connections end +# m.a.d net2net ### foreach my $country (sort keys %{Countries::countries}) { @@ -3203,7 +3233,7 @@ END print ">$country</option>"; } ### -# m.a.d Disbale pkcs-password for n2n connections +# m.a.d net2net ### if ($cgiparams{'TYPE'} eq 'host') { @@ -3230,7 +3260,7 @@ END } ### -# m.a.d Disbale pkcs-password for n2n connections end +# m.a.d net2net ### ; &Header::closebox(); @@ -3575,7 +3605,7 @@ END if ( -f "${General::swroot}/ovpn/ca/cacert.pem" ) { ### -# m.a.d Client Status Table +# m.a.d net2net ### &Header::openbox('100%', 'LEFT', $Lang::tr{'Client status and controlc' }); @@ -3624,15 +3654,12 @@ END } else { ### -# m.a.d net2net Status -### - - if ($confighash{$cgiparams{'KEY'}}[3] eq 'host'){ - - my $cn; - my @match = (); - foreach my $line (@status) { +# m.a.d net2net +### + my $cn; + my @match = (); + foreach my $line (@status) { chomp($line); if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); @@ -3641,15 +3668,15 @@ END } $cn =~ s/[_]/ /g; if ($cn eq "$confighash{$key}[2]") { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; + $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>"; } - } - } - } else { + + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { + my @tempovpnsubnet = split("\/",$confighash{$key}[27]); my @ovpnip = split /\./,$tempovpnsubnet[0]; my $pingip = ""; - + if ($confighash{$key}[6] eq 'server') { $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2"; } else { @@ -3665,10 +3692,8 @@ END } } - -### -# m.a.d net2net Status end -### +} +} my $disable_clientdl = "disabled='disabled'"; diff --git a/lfs/openvpn b/lfs/openvpn index 0937930..41594b7 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /lib/ -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/crls + -mkdir -vp /var/ipfire/ovpn/n2nconf touch /var/ipfire/ovpn/ovpn-leases.db chmod 700 /var/ipfire/ovpn/ovpn-leases.db chown -R nobody:nobody /var/ipfire/ovpn diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 163386b..5207c24 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -25,7 +25,7 @@ char enableorange[STRING_SIZE] = "off"; char OVPNRED[STRING_SIZE] = "OVPN"; char OVPNBLUE[STRING_SIZE] = "OVPN_BLUE_"; char OVPNORANGE[STRING_SIZE] = "OVPN_ORANGE_"; -char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.2.0"; +char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.2.1"; struct connection_struct { char name[STRING_SIZE]; @@ -88,7 +88,8 @@ connection *getConnections() { } char line[STRING_SIZE] = ""; - char *result; + char result[STRING_SIZE] = ""; + char *resultptr; int count; connection *conn_first = NULL; connection *conn_last = NULL; @@ -109,19 +110,31 @@ connection *getConnections() { conn_last = conn_curr; count = 0; - result = strtok(line, ","); - while (result) { + char *lineptr = &line; + while (1) { + if (*lineptr == NULL) + break; + + resultptr = result; + while (*lineptr != NULL) { + if (*lineptr == ',') { + lineptr++; + break; + } + *resultptr++ = *lineptr++; + } + *resultptr = '\0'; + if (count == 2) { strcpy(conn_curr->name, result); } else if (count == 4) { strcpy(conn_curr->type, result); - } else if (count == 12) { + } else if (count == 29) { strcpy(conn_curr->proto, result); - } else if (count == 13) { + } else if (count == 30) { conn_curr->port = atoi(result); } - result = strtok(NULL, ","); count++; } } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6dd8a471e4c9227221b85babd826ef216bf1b932
by git＠ipfire.org 04 Sep '11

04 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6dd8a471e4c9227221b85babd826ef216bf1b932 (commit) from 9c7da0c6d9adc6020a4815a90f0bb5930d57a97b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6dd8a471e4c9227221b85babd826ef216bf1b932 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 4 16:25:48 2011 +0200 core-next: remove wrong file. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/next/filelists/files | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index f2fee1b..9b39879 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -5,7 +5,6 @@ etc/system-release etc/issue etc/iproute2/rt_tables etc/rc.d/init.d/networking/red -etc/rc.d/init.d/static-routes srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/outgoinggrp.cgi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9c7da0c6d9adc6020a4815a90f0bb5930d57a97b
by git＠ipfire.org 04 Sep '11

04 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9c7da0c6d9adc6020a4815a90f0bb5930d57a97b (commit) via 5de6ca7829b163bbea10ba3ab1b1587b81ac1198 (commit) from a86240b11ac5d0577e28ce091784402547bbb46b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c7da0c6d9adc6020a4815a90f0bb5930d57a97b Merge: a86240b 5de6ca7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 4 15:59:37 2011 +0200 Merge commit 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ethtool | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/common/ethtool b/config/rootfiles/common/ethtool index 519118c..930cd05 100644 --- a/config/rootfiles/common/ethtool +++ b/config/rootfiles/common/ethtool @@ -1,2 +1,2 @@ -#usr/man/man8/ethtool.8 usr/sbin/ethtool +#usr/share/man/man8/ethtool.8 hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2011