diff options
| author | Martin Fuchs <mfuchs@pfsense.org> | 2008-04-04 00:06:36 +0000 |
|---|---|---|
| committer | Martin Fuchs <mfuchs@pfsense.org> | 2008-04-04 00:06:36 +0000 |
| commit | fe32492ec7097531ef8fd18a1d081c67c483016a (patch) | |
| tree | 1092922edf0d03dbd603915aa6cb2d9c0868a2b9 | |
| parent | 505a15cb07a945a6410026b6873ce800b73e90b2 (diff) | |
| download | pfsense-fe32492ec7097531ef8fd18a1d081c67c483016a.zip pfsense-fe32492ec7097531ef8fd18a1d081c67c483016a.tar.gz | |
OpenVPN: my fault... now its correct... the server pushes the commands...
| -rw-r--r-- | etc/inc/openvpn.inc | 3 | ||||
| -rw-r--r-- | usr/local/pkg/openvpn.xml | 6 | ||||
| -rw-r--r-- | usr/local/pkg/openvpn_cli.xml | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 01b13df..a1d29b7 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -393,6 +393,7 @@ EOD; if (!empty($settings['tls'])) $openvpn_conf .= "tls-auth {$g['varetc_path']}/openvpn_server{$id}.tls 0\n"; if (!empty($settings['maxclients'])) $openvpn_conf .= "max-clients {$settings['maxclients']}\n"; + if (!empty($settings['gwredir'])) $openvpn_conf .= "push \"redirect-gateway\"\n"; } else { // $mode == client @@ -464,8 +465,6 @@ EOD; if ($settings['passtos']) $openvpn_conf .= "passtos\n"; - if ($settings['gwredir']) $openvpn_conf .= "push \"redirect-gateway\"\n"; - if ($settings['dynamic_ip']) { $openvpn_conf .= "persist-remote-ip\n"; $openvpn_conf .= "float\n"; diff --git a/usr/local/pkg/openvpn.xml b/usr/local/pkg/openvpn.xml index 622bd66..dbb78c5 100644 --- a/usr/local/pkg/openvpn.xml +++ b/usr/local/pkg/openvpn.xml @@ -253,6 +253,12 @@ <type>checkbox</type> </field> <field> + <fieldname>gwredir</fieldname> + <fielddescr>Redirect Gateway</fielddescr> + <description>Redirect ALL traffic through the OpenVPN server.</description> + <type>checkbox</type> + </field> + <field> <fieldname>custom_options</fieldname> <fielddescr>Custom options</fielddescr> <description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the server configuration.</description> diff --git a/usr/local/pkg/openvpn_cli.xml b/usr/local/pkg/openvpn_cli.xml index d751ac4..129b86f 100644 --- a/usr/local/pkg/openvpn_cli.xml +++ b/usr/local/pkg/openvpn_cli.xml @@ -206,12 +206,6 @@ <type>checkbox</type> </field> <field> - <fieldname>gwredir</fieldname> - <fielddescr>Redirect Gateway</fielddescr> - <description>Redirect ALL traffic through the OpenVPN server.</description> - <type>checkbox</type> - </field> - <field> <fieldname>custom_options</fieldname> <fielddescr>Custom options</fielddescr> <description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the client configuration.</description> |
