[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 136193280b10cbb27f60eb3aef4cb5d0bec1c916
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 136193280b10cbb27f60eb3aef4cb5d0bec1c916 (commit) via 18f2b3d171c4b03a8801fcc595e2907aa0352a4e (commit) via 1450cfebdee10c0ff79335a4d06e42e378338c9b (commit) via f4fbb93510d52300ce7140227804f38e08cf332c (commit) via ffbe77c8bcf247a484b7791707e98fd3ab59fbdc (commit) from 16d49f73e54ca80e7f6fb670cee6f67f93187fe4 (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 136193280b10cbb27f60eb3aef4cb5d0bec1c916 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 8 19:12:59 2014 +0100
Update translations
commit 18f2b3d171c4b03a8801fcc595e2907aa0352a4e Merge: 1450cfe ffbe77c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 8 19:12:48 2014 +0100
Merge remote-tracking branch 'ummeegge/OpenVPN_additional_configs' into next
commit 1450cfebdee10c0ff79335a4d06e42e378338c9b Merge: 16d49f7 f4fbb93 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 8 19:12:39 2014 +0100
Merge remote-tracking branch 'ummeegge/OpenVPN_validating_N2N' into next
commit f4fbb93510d52300ce7140227804f38e08cf332c Author: Erik Kapfer erik.kapfer@ipfire.org Date: Thu Nov 13 10:40:42 2014 +0100
OpenVPN: Added 'valid til (days)' field for N2N.
Fixes #10680
commit ffbe77c8bcf247a484b7791707e98fd3ab59fbdc Author: Erik Kapfer erik.kapfer@ipfire.org Date: Thu Nov 13 03:09:51 2014 +0100
OpenVPN: Added additional configuration for server and clients
* Added a possibility to manualy extend OpenVPNs server and client configuration. * Added also a checkbox (on/off) in the WUI under 'Advanced server options' . * Changed the order in 'Miscellaneous options' section for better overview. * Optimized code in particular sections a little. Added a filehandle instead of system(touch...) for ccd* file generation. Unified the html code tags in processed section. Fixes #10577
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.es | 2 + doc/language_issues.fr | 2 + doc/language_issues.nl | 2 + doc/language_issues.pl | 2 + doc/language_issues.ru | 2 + doc/language_issues.tr | 2 + doc/language_missings | 8 +++ html/cgi-bin/ovpnmain.cgi | 169 ++++++++++++++++++++++++++++++++++------------ langs/de/cgi-bin/de.pl | 2 + langs/en/cgi-bin/en.pl | 2 + 10 files changed, 148 insertions(+), 45 deletions(-)
Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 4842ee2..456cb08 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -868,6 +868,7 @@ WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last @@ -916,6 +917,7 @@ WARNING: untranslated string: other WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny +WARNING: untranslated string: ovpn add conf WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh WARNING: untranslated string: ovpn dh new key diff --git a/doc/language_issues.fr b/doc/language_issues.fr index a411de4..205336a 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -879,6 +879,7 @@ WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last @@ -927,6 +928,7 @@ WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other WARNING: untranslated string: outgoing firewall access +WARNING: untranslated string: ovpn add conf WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh WARNING: untranslated string: ovpn dh new key diff --git a/doc/language_issues.nl b/doc/language_issues.nl index bb17cc7..cda03a4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -695,6 +695,7 @@ WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key WARNING: untranslated string: imei WARNING: untranslated string: imsi +WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green WARNING: untranslated string: masquerade orange @@ -718,6 +719,7 @@ WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface WARNING: untranslated string: nameserver WARNING: untranslated string: not a valid dh key +WARNING: untranslated string: ovpn add conf WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh WARNING: untranslated string: ovpn dh new key diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 4842ee2..456cb08 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -868,6 +868,7 @@ WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last @@ -916,6 +917,7 @@ WARNING: untranslated string: other WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny +WARNING: untranslated string: ovpn add conf WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh WARNING: untranslated string: ovpn dh new key diff --git a/doc/language_issues.ru b/doc/language_issues.ru index c471de9..f245a62 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -864,6 +864,7 @@ WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network WARNING: untranslated string: last @@ -911,6 +912,7 @@ WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing traffic in bytes per second +WARNING: untranslated string: ovpn add conf WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh WARNING: untranslated string: ovpn dh new key diff --git a/doc/language_issues.tr b/doc/language_issues.tr index f50f01d..6e06cd3 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -664,6 +664,8 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: invalid input for valid till days +WARNING: untranslated string: ovpn add conf WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index bf92851..85d4f25 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -335,6 +335,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for valid till days < ipsec < ipsec network < ipsec no connections @@ -392,6 +393,7 @@ < other < our donors < outgoing firewall access +< ovpn add conf < ovpn crypt options < ovpn dh < ovpn dh new key @@ -886,6 +888,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for valid till days < ipsec < ipsec network < ipsec no connections @@ -955,6 +958,7 @@ < outgoing firewall p2p description 2 < outgoing firewall p2p description 3 < outgoing firewall view group +< ovpn add conf < ovpn crypt options < ovpn dh < ovpn dh new key @@ -1421,6 +1425,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for valid till days < ipsec < ipsec network < ipsec no connections @@ -1476,6 +1481,7 @@ < other < our donors < outgoing firewall access +< ovpn add conf < ovpn crypt options < ovpn dh < ovpn dh new key @@ -1947,6 +1953,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for valid till days < ipsec < ipsec network < ipsec no connections @@ -2004,6 +2011,7 @@ < our donors < outgoing firewall access < outgoing traffic in bytes per second +< ovpn add conf < ovpn crypt options < ovpn dh < ovpn dh new key diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5dbce08..235ece5 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -70,6 +70,9 @@ my $configgrp="${General::swroot}/fwhosts/customgroups"; my $customnet="${General::swroot}/fwhosts/customnetworks"; my $name; my $col=""; +my $local_serverconf = "${General::swroot}/ovpn/scripts/server.conf.local"; +my $local_clientconf = "${General::swroot}/ovpn/scripts/client.conf.local"; + &General::readhash("${General::swroot}/ethernet/settings", %netsettings); $cgiparams{'ENABLED'} = 'off'; $cgiparams{'ENABLED_BLUE'} = 'off'; @@ -94,10 +97,33 @@ $cgiparams{'DCIPHER'} = ''; $cgiparams{'DAUTH'} = ''; $cgiparams{'TLSAUTH'} = ''; $routes_push_file = "${General::swroot}/ovpn/routes_push"; -unless (-e $routes_push_file) { system("touch $routes_push_file"); } -unless (-e "${General::swroot}/ovpn/ccd.conf") { system("touch ${General::swroot}/ovpn/ccd.conf"); } -unless (-e "${General::swroot}/ovpn/ccdroute") { system("touch ${General::swroot}/ovpn/ccdroute"); } -unless (-e "${General::swroot}/ovpn/ccdroute2") { system("touch ${General::swroot}/ovpn/ccdroute2"); } + +# Add CCD files if not already presant +unless (-e $routes_push_file) { + open(RPF, ">$routes_push_file"); + close(RPF); +} +unless (-e "${General::swroot}/ovpn/ccd.conf") { + open(CCDC, ">${General::swroot}/ovpn/ccd.conf"); + close (CCDC); +} +unless (-e "${General::swroot}/ovpn/ccdroute") { + open(CCDR, ">${General::swroot}/ovpn/ccdroute"); + close (CCDR); +} +unless (-e "${General::swroot}/ovpn/ccdroute2") { + open(CCDRT, ">${General::swroot}/ovpn/ccdroute2"); + close (CCDRT); +} +# Add additional configs if not already presant +unless (-e "$local_serverconf") { + open(LSC, ">$local_serverconf"); + close (LSC); +} +unless (-e "$local_clientconf") { + open(LCC, ">$local_clientconf"); + close (LCC); +}
&Header::getcgihash(%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
@@ -306,7 +332,22 @@ sub writeserverconf { print CONF "verb $sovpnsettings{LOG_VERB}\n"; } else { print CONF "verb 3\n"; - } + } + # Print server.conf.local if entries exist to server.conf + if ( !-z $local_serverconf && $sovpnsettings{'ADDITIONAL_CONFIGS'} eq 'on') { + open (LSC, "$local_serverconf"); + print CONF "\n#---------------------------\n"; + print CONF "# Start of custom directives\n"; + print CONF "# from server.conf.local\n"; + print CONF "#---------------------------\n\n"; + while (<LSC>) { + print CONF $_; + } + print CONF "\n#-----------------------------\n"; + print CONF "# End of custom directives\n"; + print CONF "#-----------------------------\n"; + close (LSC); + } print CONF "\n";
close(CONF); @@ -685,6 +726,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'MAX_CLIENTS'} = $cgiparams{'MAX_CLIENTS'}; $vpnsettings{'REDIRECT_GW_DEF1'} = $cgiparams{'REDIRECT_GW_DEF1'}; $vpnsettings{'CLIENT2CLIENT'} = $cgiparams{'CLIENT2CLIENT'}; + $vpnsettings{'ADDITIONAL_CONFIGS'} = $cgiparams{'ADDITIONAL_CONFIGS'}; $vpnsettings{'DHCP_DOMAIN'} = $cgiparams{'DHCP_DOMAIN'}; $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; @@ -2224,6 +2266,21 @@ else print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\r\n"; } } + # Print client.conf.local if entries exist to client.ovpn + if (!-z $local_clientconf && $vpnsettings{'ADDITIONAL_CONFIGS'} eq 'on') { + open (LCC, "$local_clientconf"); + print CLIENTCONF "\n#---------------------------\n"; + print CLIENTCONF "# Start of custom directives\n"; + print CLIENTCONF "# from client.conf.local\n"; + print CLIENTCONF "#---------------------------\n\n"; + while (<LCC>) { + print CLIENTCONF $_; + } + print CLIENTCONF "\n#---------------------------\n"; + print CLIENTCONF "# End of custom directives\n"; + print CLIENTCONF "#---------------------------\n\n"; + close (LCC); + } close(CLIENTCONF);
$zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n"; @@ -2456,6 +2513,9 @@ ADV_ERROR: $checked{'REDIRECT_GW_DEF1'}{'off'} = ''; $checked{'REDIRECT_GW_DEF1'}{'on'} = ''; $checked{'REDIRECT_GW_DEF1'}{$cgiparams{'REDIRECT_GW_DEF1'}} = 'CHECKED'; + $checked{'ADDITIONAL_CONFIGS'}{'off'} = ''; + $checked{'ADDITIONAL_CONFIGS'}{'on'} = ''; + $checked{'ADDITIONAL_CONFIGS'}{$cgiparams{'ADDITIONAL_CONFIGS'}} = 'CHECKED'; $checked{'MSSFIX'}{'off'} = ''; $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; @@ -2536,39 +2596,52 @@ print <<END; </table> <hr size='1'> <table width='100%'> - <tr> + <tr> <td class'base'><b>$Lang::tr{'misc-options'}</b></td> - </tr> - <tr> + </tr> + + <tr> <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='15%'></td><td width='35%'></td> - </tr> - <tr> + </tr> + + <tr> <td class='base'>Client-To-Client</td> <td><input type='checkbox' name='CLIENT2CLIENT' $checked{'CLIENT2CLIENT'}{'on'} /></td> - </tr> - <tr> + </tr> + + <tr> <td class='base'>Redirect-Gateway def1</td> <td><input type='checkbox' name='REDIRECT_GW_DEF1' $checked{'REDIRECT_GW_DEF1'}{'on'} /></td> - </tr> - <tr> - <td class='base'>Max-Clients</td> - <td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td> - </tr> + </tr> + <tr> - <td class='base'>Keepalive <br /> - (ping/ping-restart)</td> - <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td> - <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td> - </tr> + <td class='base'>$Lang::tr{'ovpn add conf'}</td> + <td><input type='checkbox' name='ADDITIONAL_CONFIGS' $checked{'ADDITIONAL_CONFIGS'}{'on'} /></td> + <td>$Lang::tr{'openvpn default'}: off</td> + </tr> + + <tr> + <td class='base'>mssfix</td> + <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> + <td>$Lang::tr{'openvpn default'}: off</td> + </tr> + <tr> - <td class='base'>fragment <br></td> - <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td> - </tr> - <tr> - <td class='base'>mssfix</td> - <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> - <td>$Lang::tr{'openvpn default'}: off</td> - </tr> + <td class='base'>fragment <br></td> + <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td> + </tr> + + + <tr> + <td class='base'>Max-Clients</td> + <td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td> + </tr> + <tr> + <td class='base'>Keepalive <br /> + (ping/ping-restart)</td> + <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td> + <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td> + </tr>
<tr> <td class='base'>$Lang::tr{'ovpn mtu-disc'}</td> @@ -4012,6 +4085,10 @@ if ($cgiparams{'TYPE'} eq 'net') { $errormessage = $Lang::tr{'passwords do not match'}; goto VPNCONF_ERROR; } + if ($cgiparams{'DAYS_VALID'} ne '' && $cgiparams{'DAYS_VALID'} !~ /^[0-9]+$/) { + $errormessage = $Lang::tr{'invalid input for valid till days'}; + goto VPNCONF_ERROR; + }
# Replace empty strings with a . (my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/./; @@ -4282,6 +4359,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $cgiparams{'CERT_CITY'} = $vpnsettings{'ROOTCERT_CITY'}; $cgiparams{'CERT_STATE'} = $vpnsettings{'ROOTCERT_STATE'}; $cgiparams{'CERT_COUNTRY'} = $vpnsettings{'ROOTCERT_COUNTRY'}; + $cgiparams{'DAYS_VALID'} = $vpnsettings{'DAYS_VALID'}; }
VPNCONF_ERROR: @@ -4643,27 +4721,28 @@ END
if ($cgiparams{'TYPE'} eq 'host') { print <<END; - </select></td></tr> - - <td> </td><td class='base'>$Lang::tr{'valid till'} (days):</td> - <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> - <tr><td> </td> + </select></td></tr> + <td> </td><td class='base'>$Lang::tr{'valid till'} (days):</td> + <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> + <tr><td> </td> <td class='base'>$Lang::tr{'pkcs12 file password'}:</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr> - <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<br>($Lang::tr{'confirmation'})</td> + <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<br>($Lang::tr{'confirmation'})</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr> - <tr><td colspan='3'> </td></tr> - <tr><td colspan='3'><hr /></td></tr> - <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> - </table> + <tr><td colspan='3'> </td></tr> + <tr><td colspan='3'><hr /></td></tr> + <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> + </table> END }else{ print <<END; - </select></td></tr> - <tr><td> </td><td> </td><td> </td></tr> - <tr><td> </td><td> </td><td> </td></tr> - <tr><td colspan='3'><hr /></td></tr> - <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> + </select></td></tr> + <td> </td><td class='base'>$Lang::tr{'valid till'} (days):</td> + <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> + <tr><td> </td><td> </td><td> </td></tr> + <tr><td> </td><td> </td><td> </td></tr> + <tr><td colspan='3'><hr /></td></tr> + <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </table>
END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b7692ee..3f96a60 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1295,6 +1295,7 @@ 'invalid input for organization' => 'Ungültige Eingabe für Organisation', 'invalid input for remote host/ip' => 'Ungültige Eingabe für Remote Host/IP', 'invalid input for state or province' => 'Ungültige Eingabe für Bundesstaat oder Provinz.', +'invalid input for valid till days' => 'Ungültige Eingabe für Gültig bis (Tage).', 'invalid ip' => 'Ungültige IP-Adresse', 'invalid keep time' => 'Die Aufbewahrungszeit muss eine gültige Zahl sein', 'invalid key' => 'Ungültiger Schlüssel.', @@ -1689,6 +1690,7 @@ 'outgoing traffic in bytes per second' => 'Abgehender Verkehr', 'override mtu' => 'Überschreibe Standard MTU', 'ovpn' => 'OpenVPN', +'ovpn add conf' => 'Erweiterte Konfiguration', 'ovpn con stat' => 'OpenVPN Verbindungs-Statistik', 'ovpn config' => 'OVPN-Konfiguration', 'ovpn crypt options' => 'Kryptografieoptionen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1986409..ad331b2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1325,6 +1325,7 @@ 'invalid input for organization' => 'Invalid input for organization', 'invalid input for remote host/ip' => 'Invalid input for remote host/ip.', 'invalid input for state or province' => 'Invalid input for state or province.', +'invalid input for valid till days' => 'Invalid input for Valid till (days).', 'invalid ip' => 'Invalid IP Address', 'invalid keep time' => 'Keep time must be a valid number', 'invalid key' => 'Invalid key.', @@ -1720,6 +1721,7 @@ 'outgoing traffic in bytes per second' => 'Outgoing Traffic', 'override mtu' => 'Override default MTU', 'ovpn' => 'OpenVPN', +'ovpn add conf' => 'Additional configuration', 'ovpn con stat' => 'OpenVPN Connection Statistics', 'ovpn config' => 'OVPN-Config', 'ovpn crypt options' => 'Cryptographic options',
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org