diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-01-19 22:37:43 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-01-19 23:15:54 +0100 |
| commit | ab50e4802f3af1db1d82db503a6e5b0664549f61 (patch) | |
| tree | e5fb5c1ef63e78f63e5962f191ba9204a6813676 /net/openconnect/files | |
| parent | cd73693255de0492176bfaa86bc7b6340015a0a3 (diff) | |
Revert "openconnect: move certificate files to config/ to add graceful upgrade"
This reverts commit b53e5bfe875d673fc8a57a4766d7af6fc1b3e074.
Diffstat (limited to 'net/openconnect/files')
| -rwxr-xr-x | net/openconnect/files/openconnect.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index 2d3f7141c..553a4ed51 100755 --- 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" |