diff options
| -rw-r--r-- | net/openconnect/README | 6 | ||||
| -rwxr-xr-x | net/openconnect/files/openconnect.sh | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/net/openconnect/README b/net/openconnect/README index 3cd562194..11e98f5ea 100644 --- a/net/openconnect/README +++ b/net/openconnect/README @@ -14,9 +14,9 @@ config interface 'MYVPN' option authgroup 'DEFAULT' The additional files are also used: -/etc/openconnect/user-cert-vpn-MYVPN.pem: The user certificate -/etc/openconnect/user-key-vpn-MYVPN.pem: The user private key -/etc/openconnect/ca-vpn-MYVPN.pem: The CA certificate (instead of serverhash) +/etc/config/openconnect-user-cert-vpn-MYVPN.pem: The user certificate +/etc/config/openconnect-user-key-vpn-MYVPN.pem: The user private key +/etc/config/openconnect-ca-vpn-MYVPN.pem: The CA certificate (instead of serverhash) After these are setup you can initiate the VPN using "ifup MYVPN", and deinitialize it using ifdown. You may also use the luci web interface diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index 553a4ed51..2d3f7141c 100755 --- a/net/openconnect/files/openconnect.sh +++ b/net/openconnect/files/openconnect.sh @@ -38,12 +38,19 @@ proto_openconnect_setup() { cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script" - [ -f /etc/openconnect/user-cert-vpn-$config.pem ] && append cmdline "-c /etc/openconnect/user-cert-vpn-$config.pem" - [ -f /etc/openconnect/user-key-vpn-$config.pem ] && append cmdline "--sslkey /etc/openconnect/user-key-vpn-$config.pem" - [ -f /etc/openconnect/ca-vpn-$config.pem ] && { + # migrate to new config files + [ -f /etc/openconnect/user-cert-vpn-$config.pem ] && mv "/etc/openconnect/user-cert-vpn-$config.pem" "/etc/config/openconnect-user-cert-vpn-$config.pem" + [ -f /etc/openconnect/user-key-vpn-$config.pem ] && mv "/etc/openconnect/user-key-vpn-$config.pem" "/etc/config/openconnect-user-key-vpn-$config.pem" + [ -f /etc/openconnect/ca-vpn-$config.pem ] && mv "/etc/openconnect/ca-vpn-$config.pem" "/etc/config/openconnect-ca-vpn-$config.pem" + + # read new config files + [ -f /etc/config/openconnect-user-cert-vpn-$config.pem ] && append cmdline "-c /etc/config/openconnect-user-cert-vpn-$config.pem" + [ -f /etc/config/openconnect-user-key-vpn-$config.pem ] && append cmdline "--sslkey /etc/config/openconnect-user-key-vpn-$config.pem" + [ -f /etc/config/openconnect-ca-vpn-$config.pem ] && { append cmdline "--cafile /etc/openconnect/ca-vpn-$config.pem" append cmdline "--no-system-trust" } + [ -n "$serverhash" ] && { append cmdline " --servercert=$serverhash" append cmdline "--no-system-trust" |