Changed dynamic config generation

Renamed dynamic file, made interface name dynamic (changes with env variable)

Author: SloCompTech

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Added `TUNNEL_INTERFACE` to set interface name (in case of multiple containers)
 - Some fixes for general user
+- Changed generation of `include-conf.conf` to `dynamic.conf`
 
 ### 2.0.1 - Fix service start
 

root/defaults/openvpn/system.conf

@@ -10,9 +10,6 @@
 # Change permissions (user & group)
 iproute "/usr/local/sbin/ovpn-ip"
 
-# Static interface
-dev tun0
-
 # Script security level
 script-security 2
 
@@ -54,4 +51,4 @@ client-config-dir /config/openvpn/ccd
 crl-verify /config/pki/crl.pem
 
 # Include configs
-config /config/openvpn/include-conf.conf
+config /config/openvpn/dynamic.conf

root/etc/cont-init.d/70-config.sh

@@ -1,23 +1,29 @@
 #!/usr/bin/with-contenv bash
 
 #
-#	Link OpenVPN configs
+#	Dynamic OpenVPN configs
 #
 
-LINK_FILE=/config/openvpn/include-conf.conf
+DYNAMIC_FILE=/config/openvpn/dynamic.conf
 
 # Build link file
-echo "#" > $LINK_FILE
-echo "# DO NOT EDIT" >> $LINK_FILE
-echo "# Autogenerated file, based on /config/openvpn/config" >> $LINK_FILE
-echo "#" >> $LINK_FILE
-echo "" >> $LINK_FILE
+echo "#" > $DYNAMIC_FILE
+echo "# DO NOT EDIT" >> $DYNAMIC_FILE
+echo "# Autogenerated file, based on /config/openvpn/config" >> $DYNAMIC_FILE
+echo "#" >> $DYNAMIC_FILE
+echo "" >> $DYNAMIC_FILE
 
+# Set interface name
+echo "# Interface" >> $DYNAMIC_FILE
+echo "dev $TUNNEL_INTERFACE" >> $DYNAMIC_FILE
+echo "" >> $DYNAMIC_FILE
+
+# Include all configuration files
 for file in /config/openvpn/config/*
 do
 	[ -e "$file" ] || continue
 
-	echo "config $file" >> $LINK_FILE
+	echo "config $file" >> $DYNAMIC_FILE
 done
 
-chown abc:abc $LINK_FILE
+chown $CONTAINER_USER:$CONTAINER_USER $DYNAMIC_FILE