admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: openvpn at /usr/sbin/openvpn2.5

Browse Source 
- Fix operation on QNAP devices
- Refer to #157
This commit is contained in:
Quentin McGaw
2021-11-12 22:48:19 +00:00
parent c07a0b0ada
commit 82c0f523aa
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -179,6 +179,7 @@ RUN apk add --no-cache --update -l apk-tools && \
mv /usr/sbin/openvpn /usr/sbin/openvpn2.4 && \ mv /usr/sbin/openvpn /usr/sbin/openvpn2.4 && \
apk del openvpn && \ apk del openvpn && \
apk add --no-cache --update openvpn ca-certificates iptables ip6tables unbound tzdata && \ apk add --no-cache --update openvpn ca-certificates iptables ip6tables unbound tzdata && \
mv /usr/sbin/openvpn /usr/sbin/openvpn2.5 && \
rm -rf /var/cache/apk/* /etc/unbound/* /usr/sbin/unbound-* /etc/openvpn/*.sh /usr/lib/openvpn/plugins/openvpn-plugin-down-root.so && \ rm -rf /var/cache/apk/* /etc/unbound/* /usr/sbin/unbound-* /etc/openvpn/*.sh /usr/lib/openvpn/plugins/openvpn-plugin-down-root.so && \
deluser openvpn && \ deluser openvpn && \
deluser unbound && \ deluser unbound && \

2
internal/openvpn/start.go
View File

@@ -15,7 +15,7 @@ var ErrVersionUnknown = errors.New("OpenVPN version is unknown")
const ( const (
binOpenvpn24 = "openvpn2.4" binOpenvpn24 = "openvpn2.4"
binOpenvpn25 = "openvpn" binOpenvpn25 = "openvpn2.5"
) )
func start(ctx context.Context, starter command.Starter, version string, flags []string) ( func start(ctx context.Context, starter command.Starter, version string, flags []string) (