From 612b899549ba65d6789b0c22486e837f1babf671 Mon Sep 17 00:00:00 2001
From: Master <master_gitea@gorillamail.biz>
Date: Thu, 20 Mar 2025 01:11:22 +0000
Subject: [PATCH] Fix absolute paths

---
 setup_openvpn.sh | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/setup_openvpn.sh b/setup_openvpn.sh
index ae9777e..4eb5c57 100755
--- a/setup_openvpn.sh
+++ b/setup_openvpn.sh
@@ -20,6 +20,7 @@ rm -f /etc/openvpn/server/*.pem
 rm -f /etc/openvpn/server/server.conf
 rm -f /etc/openvpn/server/generate-client.sh
 rm -rf /etc/openvpn/client/*
+rm -f /etc/openvpn/server.conf
 
 # Verify cleanup
 if [ -d "/etc/openvpn/server/easy-rsa" ]; then
@@ -76,10 +77,10 @@ cat > /etc/openvpn/server/server.conf << EOF
 port 1194
 proto udp
 dev tun
-ca ca.crt
-cert server.crt
-key server.key
-dh dh.pem
+ca /etc/openvpn/server/ca.crt
+cert /etc/openvpn/server/server.crt
+key /etc/openvpn/server/server.key
+dh /etc/openvpn/server/dh.pem
 server 10.8.0.0 255.255.255.0
 push "redirect-gateway def1 bypass-dhcp"
 push "dhcp-option DNS 8.8.8.8"
@@ -90,10 +91,19 @@ user nobody
 group nogroup
 persist-key
 persist-tun
-status openvpn-status.log
+status /var/log/openvpn/openvpn-status.log
+log-append /var/log/openvpn/openvpn.log
 verb 3
 EOF
 
+# Make sure log directory exists
+echo "Creating log directory..."
+mkdir -p /var/log/openvpn
+
+# Copy server.conf to the correct location for systemd
+echo "Copying server.conf to the correct location for systemd..."
+cp /etc/openvpn/server/server.conf /etc/openvpn/server.conf
+
 # Enable IP forwarding
 echo "Enabling IP forwarding..."
 echo "net.ipv4.ip_forward=1" > /etc/sysctl.d/99-openvpn.conf
@@ -127,10 +137,14 @@ cd /etc/openvpn/server/easy-rsa
 ./easyrsa gen-req $CLIENT_NAME nopass
 ./easyrsa sign-req client $CLIENT_NAME
 
+# Make sure client directory exists
+mkdir -p /etc/openvpn/client
+
 # Create client configuration
 cat > /etc/openvpn/client/$CLIENT_NAME.ovpn << EOL
 client
 proto udp
+dev tun
 explicit-exit-notify
 remote $(curl -s ifconfig.me) 1194
 resolv-retry infinite
@@ -152,7 +166,15 @@ $(cat /etc/openvpn/server/easy-rsa/pki/private/$CLIENT_NAME.key)
 </key>
 EOL
 
+# Create auth.txt file
+cat > /etc/openvpn/client/auth.txt << EOL
+# Add your username and password here if needed
+# username
+# password
+EOL
+
 echo "Client configuration created: /etc/openvpn/client/$CLIENT_NAME.ovpn"
+echo "Don't forget to configure auth.txt with your credentials if needed"
 EOF
 
 chmod +x /etc/openvpn/server/generate-client.sh