Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-client-management-panel

This commit is contained in:
vladimir.kuznetsov 2023-02-27 19:59:01 +03:00
commit 4171afe275
55 changed files with 820 additions and 337 deletions

View file

@ -1,5 +1,4 @@
FROM alpine:3.15
LABEL maintainer="AmneziaVPN"
ARG SS_RELEASE="v1.13.1"

View file

@ -1,6 +1,6 @@
cat > /opt/amnezia/openvpn/server.conf <<EOF
port $OPENVPN_PORT
proto $OPENVPN_TRANSPORT_PROTO
proto tcp
dev tun
ca /opt/amnezia/openvpn/ca.crt
cert /opt/amnezia/openvpn/AmneziaReq.crt
@ -40,7 +40,7 @@ cat > /opt/amnezia/cloak/ck-config.json <<EOF
{
"ProxyBook": {
"openvpn": [
"$OPENVPN_TRANSPORT_PROTO",
"tcp",
"localhost:$OPENVPN_PORT"
],
"shadowsocks": [

View file

@ -1,6 +1,6 @@
client
dev tun
proto $OPENVPN_TRANSPORT_PROTO
proto tcp
resolv-retry infinite
nobind
persist-key