commit ab50e4802f3af1db1d82db503a6e5b0664549f61 parent cd73693255de0492176bfaa86bc7b6340015a0a3 Author: Nikos Mavrogiannopoulos <nmav@gnutls.org> Date: Mon, 19 Jan 2015 22:37:43 +0100 Revert "openconnect: move certificate files to config/ to add graceful upgrade" This reverts commit b53e5bfe875d673fc8a57a4766d7af6fc1b3e074. Diffstat:
| M | net/openconnect/README | | | 6 | +++--- |
| M | net/openconnect/files/openconnect.sh | | | 13 | +++---------- |
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git 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/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) +/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) 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 @@ -38,19 +38,12 @@ proto_openconnect_setup() { cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script" - # 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 ] && { + [ -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 ] && { 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"