From 3a2ffa191baee0cdd1e2d582a688ca78547e5776 Mon Sep 17 00:00:00 2001
From: Johan <johan.followit@gmail.com>
Date: Thu, 20 Mar 2025 08:20:56 +0100
Subject: [PATCH] Add static IP assignment to OpenVPN

---
 BashScripts/add-openvpn-client.sh     | 8 ++++++++
 BashScripts/install-openvpn-server.sh | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/BashScripts/add-openvpn-client.sh b/BashScripts/add-openvpn-client.sh
index 8cb6948..c388fbe 100644
--- a/BashScripts/add-openvpn-client.sh
+++ b/BashScripts/add-openvpn-client.sh
@@ -15,6 +15,14 @@ if [ -f "/etc/openvpn/easy-rsa/pki/issued/$CLIENT_NAME.crt" ]; then
 	echo Client $CLIENT_NAME already exists...
 	exit 1
 fi
+VPN_SUBNET=$(grep -E '^server ' "/etc/openvpn/myserver.conf" | awk '{print $2}')
+read -e -p "Use static IP for this client? VPN subnet is $VPN_SUBNET (Leave empty for dynamic): " -i "" CLIENT_IP
+if [ ! -z "${CLIENT_IP}" ]; then
+	echo Setting IP...
+cat > "/etc/openvpn/ccd/$CLIENT_NAME" <<EOL
+ifconfig-push $CLIENT_IP 255.255.255.0
+EOL
+fi
 
 cd /etc/openvpn/easy-rsa
 ./easyrsa gen-req $CLIENT_NAME nopass
diff --git a/BashScripts/install-openvpn-server.sh b/BashScripts/install-openvpn-server.sh
index 7f0d8f4..0422c41 100644
--- a/BashScripts/install-openvpn-server.sh
+++ b/BashScripts/install-openvpn-server.sh
@@ -28,6 +28,9 @@ fi
 if [ ! -d /var/log/openvpn ]; then
 	mkdir -p /var/log/openvpn
 fi
+if [ ! -d /etc/openvpn/ccd ]; then
+	mkdir -p /etc/openvpn/ccd
+fi
 if ufw status | grep -q "Status: active"; then
 	echo Adding firewall rules...
 	ufw allow $VPN_PUBLIC_PORT/udp
@@ -52,6 +55,9 @@ dh dh.pem
 
 server $VPN_SUBNET.0 255.255.255.0
 ifconfig-pool-persist /var/log/openvpn/ipp.txt
+client-config-dir /etc/openvpn/ccd
+topology subnet
+ifconfig-pool $VPN_SUBNET.2 $VPN_SUBNET.126
 push "route $LAN_SUBNET.0 255.255.255.0"
 
 keepalive 10 120