From e71907a1a16a614600a9da14135510e956b593f0 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Fri, 13 Feb 2026 18:17:36 +0100 Subject: [PATCH] remove openvpn server --- compose.gluetun.yaml | 21 ++++++++++++++++ compose.openvpn-server.yaml | 20 --------------- openvpn-server/.gitignore | 3 --- openvpn-server/logrotate.d/openvpn | 8 ------ openvpn-server/openvpn.conf | 39 ------------------------------ openvpn-server/ovpn_env.sh | 25 ------------------- 6 files changed, 21 insertions(+), 95 deletions(-) create mode 100644 compose.gluetun.yaml delete mode 100644 compose.openvpn-server.yaml delete mode 100644 openvpn-server/.gitignore delete mode 100644 openvpn-server/logrotate.d/openvpn delete mode 100644 openvpn-server/openvpn.conf delete mode 100644 openvpn-server/ovpn_env.sh diff --git a/compose.gluetun.yaml b/compose.gluetun.yaml new file mode 100644 index 0000000..0f2ed5e --- /dev/null +++ b/compose.gluetun.yaml @@ -0,0 +1,21 @@ +services: + gluetun: + image: qmcgaw/gluetun:v3.41.1 + container_name: gluetun + cap_add: + - NET_ADMIN + environment: + - VPN_SERVICE_PROVIDER=surfshark + - VPN_TYPE=openvpn + - OPENVPN_USER=${SURFSHARK_USER:?} + - OPENVPN_PASSWORD=${SURFSHARK_PASSWORD:?} + - REGION=Europe + - SERVER_COUNTRIES=Netherlands + - LOCAL_NETWORK=192.168.2.0/24 + - TRANSMISSION_RPC_PORT=9091 + ports: + - 1080:1080 + - 9091:9091 + - 9092:9092 + - 6881:6881 + - 6881:6881/udp diff --git a/compose.openvpn-server.yaml b/compose.openvpn-server.yaml deleted file mode 100644 index 0edb6ac..0000000 --- a/compose.openvpn-server.yaml +++ /dev/null @@ -1,20 +0,0 @@ -services: - openvpn-server: - image: kylemanna/openvpn:2.4 - container_name: openvpn-server - cap_add: - - NET_ADMIN - extra_hosts: - - "host:${HOST_IP}" - ports: - - 444:443 - privileged: true - restart: unless-stopped - volumes: - - /opt/openvpn-server:/etc/openvpn - - /opt/openvpn-server/logrotate.d/openvpn:/etc/logrotate.d/openvpn - healthcheck: - test: ["CMD-SHELL", "ip link show tun0 || exit 1"] - interval: 30s - timeout: 5s - retries: 3 diff --git a/openvpn-server/.gitignore b/openvpn-server/.gitignore deleted file mode 100644 index 90850cb..0000000 --- a/openvpn-server/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -crl.pem -pki -shuttle.ovpn diff --git a/openvpn-server/logrotate.d/openvpn b/openvpn-server/logrotate.d/openvpn deleted file mode 100644 index b38cc42..0000000 --- a/openvpn-server/logrotate.d/openvpn +++ /dev/null @@ -1,8 +0,0 @@ -/etc/openvpn/*.log { - daily - rotate 7 - delaycompress - compress - notifempty - missingok -} diff --git a/openvpn-server/openvpn.conf b/openvpn-server/openvpn.conf deleted file mode 100644 index 3d940e6..0000000 --- a/openvpn-server/openvpn.conf +++ /dev/null @@ -1,39 +0,0 @@ -### Default -server 192.168.255.0 255.255.255.0 -verb 3 -key /etc/openvpn/pki/private/csbnw.no-ip.org.key -ca /etc/openvpn/pki/ca.crt -cert /etc/openvpn/pki/issued/csbnw.no-ip.org.crt -dh /etc/openvpn/pki/dh.pem -tls-auth /etc/openvpn/pki/ta.key -key-direction 0 -keepalive 10 60 -persist-key -persist-tun - -### Misc -duplicate-cn -#auth-nocache -#cipher AES-256-CBC -#comp-lzo - -### Enable 443/TCP -proto tcp -port 443 -dev tun0 - -### Logging -status /etc/openvpn/openvpn-status.log -log-append /etc/openvpn/openvpn.log - -user nobody -group nogroup - -### Route Configurations Below -route 192.168.254.0 255.255.255.0 - -### Push Configurations Below -push "dhcp-option DNS 192.168.2.200" - -### Webserver -#port-share host 444 diff --git a/openvpn-server/ovpn_env.sh b/openvpn-server/ovpn_env.sh deleted file mode 100644 index fc767c7..0000000 --- a/openvpn-server/ovpn_env.sh +++ /dev/null @@ -1,25 +0,0 @@ -declare -x OVPN_AUTH= -declare -x OVPN_CIPHER= -declare -x OVPN_CLIENT_TO_CLIENT= -declare -x OVPN_CN=rik.veenboer.xyz -declare -x OVPN_COMP_LZO=0 -declare -x OVPN_DEFROUTE=1 -declare -x OVPN_DEVICE=tun -declare -x OVPN_DEVICEN=0 -declare -x OVPN_DISABLE_PUSH_BLOCK_DNS=0 -declare -x OVPN_DNS=1 -declare -x OVPN_DNS_SERVERS=([0]="8.8.8.8" [1]="8.8.4.4") -declare -x OVPN_ENV=/etc/openvpn/ovpn_env.sh -declare -x OVPN_EXTRA_CLIENT_CONFIG=() -declare -x OVPN_EXTRA_SERVER_CONFIG=() -declare -x OVPN_FRAGMENT= -declare -x OVPN_KEEPALIVE='10 60' -declare -x OVPN_MTU= -declare -x OVPN_NAT=0 -declare -x OVPN_PORT=443 -declare -x OVPN_PROTO=tcp -declare -x OVPN_PUSH=() -declare -x OVPN_ROUTES=([0]="192.168.254.0/24") -declare -x OVPN_SERVER=192.168.255.0/24 -declare -x OVPN_SERVER_URL=tcp://rik.veenboer.xyz:443 -declare -x OVPN_TLS_CIPHER=