diff options
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 13 | ||||
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.xml | 2 | ||||
| -rwxr-xr-x | config/openvpn-client-export/vpn_openvpn_export.php | 18 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
6 files changed, 31 insertions, 8 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 2ecb436b..c6a6f6e6 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -181,6 +181,18 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys $nl = ($doslines) ? "\r\n" : "\n"; $conf = ""; + if ($expformat == "inlinevisc") { + $conf .= <<<EOF +#-- Config Auto Generated By pfSense for Viscosity --# + +#viscosity startonopen false +#viscosity dhcp true +#viscosity dnssupport true +#viscosity name {$friendly_name} + +EOF; + } + $validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid); if ($validconfig) { list($settings, $server_cert, $server_ca, $servercn, $user, $cert, $nokeys) = $validconfig; @@ -413,6 +425,7 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys case "inline": case "inlinedroid": case "inlineios": + case "inlinevisc": // Inline CA $conf .= "<ca>{$nl}" . trim($server_ca) . "{$nl}</ca>{$nl}"; if ($settings['mode'] != "server_user") { diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index f1d032a9..adae671e 100755 --- a/config/openvpn-client-export/openvpn-client-export.xml +++ b/config/openvpn-client-export/openvpn-client-export.xml @@ -44,7 +44,7 @@ ]]> </copyright> <name>OpenVPN Client Export</name> - <version>1.2.20</version> + <version>1.3.0</version> <title>OpenVPN Client Export</title> <include_file>/usr/local/pkg/openvpn-client-export.inc</include_file> <tabs> diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 246e7421..4414dfe8 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -240,6 +240,10 @@ if (!empty($act)) { $exp_name = urlencode($exp_name . "-ios-config.ovpn"); $expformat = "inlineios"; break; + case "confinlinevisc": + $exp_name = urlencode($exp_name . "-viscosity-config.ovpn"); + $expformat = "inlinevisc"; + break; default: $exp_name = urlencode($exp_name . "-config.ovpn"); $expformat = "baseconf"; @@ -485,9 +489,11 @@ function server_changed() { cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ", -1)'>x86-win6<\/a>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ", -1)'>x64-win6<\/a>"; - cell2.innerHTML += "<br\/>- Mac OS X:<br\/>"; + cell2.innerHTML += "<br\/>- Viscosity (Mac OS X and Windows):<br\/>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinevisc\"," + i + ", -1)'>Viscosity Inline Config<\/a>"; } for (j = 0; j < certs.length; j++) { var row = table.insertRow(table.rows.length); @@ -524,9 +530,11 @@ function server_changed() { cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\", -1," + j + ")'>x86-win6<\/a>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\", -1," + j + ")'>x64-win6<\/a>"; - cell2.innerHTML += "<br\/>- Mac OS X:<br\/>"; + cell2.innerHTML += "<br\/>- Viscosity (Mac OS X and Windows):<br\/>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"visc\", -1," + j + ")'>Viscosity Bundle<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinevisc\", -1," + j + ")'>Viscosity Inline Config<\/a>"; if (servers[index][2] == "server_tls") { cell2.innerHTML += "<br\/>- Yealink SIP Handsets: <br\/>"; cell2.innerHTML += " "; @@ -570,9 +578,11 @@ function server_changed() { cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ")'>x86-win6<\/a>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ")'>x64-win6<\/a>"; - cell2.innerHTML += "<br\/>- Mac OS X:<br\/>"; + cell2.innerHTML += "<br\/>- Viscosity (Mac OS X and Windows):<br\/>"; cell2.innerHTML += " "; cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ")'>Viscosity Bundle<\/a>"; + cell2.innerHTML += " "; + cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinevisc\"," + i + ")'>Viscosity Inline Config<\/a>"; } } @@ -939,7 +949,7 @@ function useproxy_changed(obj) { <br/><a href="https://play.google.com/store/apps/details?id=de.blinkt.openvpn"><?= gettext("OpenVPN For Android") ?></a> - <?=gettext("Recommended client for Android")?> <br/><a href="http://www.featvpn.com/"><?= gettext("FEAT VPN For Android") ?></a> - <?=gettext("For older versions of Android")?> <br/><?= gettext("OpenVPN Connect") ?>: <a href="https://play.google.com/store/apps/details?id=net.openvpn.openvpn"><?=gettext("Android (Google Play)")?></a> or <a href="https://itunes.apple.com/us/app/openvpn-connect/id590379981"><?=gettext("iOS (App Store)")?></a> - <?= gettext("Recommended client for iOS") ?> - <br/><a href="https://www.sparklabs.com/viscosity/"><?= gettext("Viscosity") ?></a> - <?= gettext("Recommended client for Mac OS X") ?> + <br/><a href="https://www.sparklabs.com/viscosity/"><?= gettext("Viscosity") ?></a> - <?= gettext("Recommended commercial client for Mac OS X and Windows") ?> <br/><a href="https://tunnelblick.net"><?= gettext("Tunnelblick") ?></a> - <?= gettext("Free client for OS X") ?> </td> </tr> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 7e39e5e1..1e21c95c 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1232,7 +1232,7 @@ <build_port_path>/usr/ports/archivers/zip</build_port_path> <port_category>security</port_category> <run_depends>share/openvpn/client-export/template/config-import:security/openvpn-client-export bin/zip:archivers/zip bin/7z:archivers/p7zip</run_depends> - <version>1.2.20</version> + <version>1.3.0</version> <status>RELEASE</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index f6737de3..1040190f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1302,7 +1302,7 @@ <depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.2.19</version> + <version>1.3.0</version> <status>RELEASE</status> <required_version>2.0</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 5a75922a..d6d9b6dd 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1289,7 +1289,7 @@ <depends_on_package_pbi>zip-3.0-amd64.pbi p7zip-9.20.1-amd64.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.2.19</version> + <version>1.3.0</version> <status>RELEASE</status> <required_version>2.0</required_version> <config_file>https://packages.pfsense.org/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> |