diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-13 20:28:44 +0200 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-13 20:52:32 +0200 |
commit | 6a333b489f15e0d66e0262328606c9244f211568 (patch) | |
tree | caad4ab0c7c8b45fb44555061f0d3965de7e5444 /main/openvpn/openvpn.confd | |
parent | 94a65a421705eb0152c2a6cdeb0bffd269c58e97 (diff) | |
download | aports-6a333b489f15e0d66e0262328606c9244f211568.tar.bz2 aports-6a333b489f15e0d66e0262328606c9244f211568.tar.xz |
main/openvpn: fix backward compatibility of init script
This fixes problem introduced in commit 4a66978dd949d571fdd984d800b3121c3a1a297f.
When user upgrades openvpn package, but (s)he has never modified
/etc/conf.d/openvpn file, apk automatically updates it and so sets openvpn
to the client mode. I forgot to this case and wrongly assumed that existing
config is always preserved.
BTW, the previoud change was based on
https://github.com/OpenRC/openrc/blob/master/support/init.d.examples/openvpn.in.
Ref #8875 (https://bugs.alpinelinux.org/issues/8875)
Diffstat (limited to 'main/openvpn/openvpn.confd')
-rw-r--r-- | main/openvpn/openvpn.confd | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/main/openvpn/openvpn.confd b/main/openvpn/openvpn.confd index 4359ef8cd5..7274a079de 100644 --- a/main/openvpn/openvpn.confd +++ b/main/openvpn/openvpn.confd @@ -1,17 +1,21 @@ # Configuration for /etc/init.d/openvpn{,.*} -# Run in client mode. If this is a server, set to "no". -client_mode="yes" +# OpenVPN can run in many modes. Most people want the init script to +# automatically detect the mode and try and apply a good default configuration +# and setup scripts. However, there are cases where the OpenVPN configuration +# looks like a client, but it's really a peer or something else. +# detect_client controls this behaviour. +#detect_client="yes" # Path of the OpenVPN configuration file to load. # Default is /etc/openvpn/openvpn.conf, or /etc/openvpn/<vpn>.conf if # the runscript is symlinked to openvpn.<vpn> or <vpn>. #cfgfile= -# The script to run after successful TUN/TAP device open. +# The script to run in client mode after successful TUN/TAP device open. #up_script="/etc/openvpn/up.sh" -# The script to run after TUN/TAP device close. +# The script to run in client mode after TUN/TAP device close. #down_script="/etc/openvpn/down.sh" # OpenVPN automatically creates an /etc/resolv.conf (or sends it to |