small bug in install scripts fixed

.env.example

@@ -12,10 +12,13 @@ DB_PASS=openvpn_pass
 VPN_CONF=/etc/openvpn
 VPN_LOCAL=192.168.1.2
 VPN_REMOTE=172.10.12.15
+VPN_USER=nobody
+VPN_GROUP=nogroup
 VPN_PORT=1194
 VPN_PROTO=tcp
 VPN_INIF=tun0
 VPN_OUTIF=eth0
+# TODO: Rewrite this part to ipcalc
 VPN_SERVER="10.8.0.0 255.255.255.0"
 VPN_NET=10.8.0.0/24
 

scripts/install-openvpn.sh

@@ -15,10 +15,10 @@ base_path=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 # Read dotEnv file
 source "$base_path/../.env"
 
-source ./install/00_env.sh
-source ./install/03_certificate.sh
-source ./install/04_openvpn.sh
-source ./install/05_firewall.sh
+source "$base_path/install/00_env.sh"
+source "$base_path/install/03_certificate.sh"
+source "$base_path/install/04_openvpn.sh"
+source "$base_path/install/05_firewall.sh"
 
 printf "\033[1m\n#################################### Finish ####################################\n"
 

scripts/install.sh

@@ -48,12 +48,12 @@ base_path=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 # Read dotEnv file
 source "$base_path/../.env"
 
-source ./install/00_env.sh
-source ./install/01_mysql.sh
-source ./install/02_app.sh
-source ./install/03_certificate.sh
-source ./install/04_openvpn.sh
-source ./install/05_firewall.sh
+source "$base_path/install/00_env.sh"
+source "$base_path/install/01_mysql.sh"
+source "$base_path/install/02_app.sh"
+source "$base_path/install/03_certificate.sh"
+source "$base_path/install/04_openvpn.sh"
+source "$base_path/install/05_firewall.sh"
 
 printf "\033[1m\n#################################### Finish ####################################\n"
 

scripts/install/00_env.sh

@@ -18,16 +18,20 @@ printf "\n################## Server informations ##################\n"
 [ -z "$VPN_PORT" ]  && read -p "OpenVPN port [443]: " VPN_PORT
 [ -z "$VPN_PORT" ]  && VPN_PORT="443"
 
+[ ! -z "$VPN_USER" ] && echo "VPN_USER=$VPN_USER"
+[ -z "$VPN_USER" ] && read -p "OpenVPN user [nobody]: " VPN_USER
+[ -z "$VPN_USER" ] && VPN_USER="nobody"
+
 [ ! -z "$VPN_GROUP" ] && echo "VPN_GROUP=$VPN_GROUP"
 [ -z "$VPN_GROUP" ] && read -p "OpenVPN group [nogroup]: " VPN_GROUP
 [ -z "$VPN_GROUP" ] && VPN_GROUP="nogroup"
 
 [ ! -z "$VPN_INIF" ] && echo "VPN_INIF=$VPN_INIF"
-[ -z "$VPN_INIF" ]  && read -p "OpenVPN input interface [tun0]: " VPN_INIF
+[ -z "$VPN_INIF" ]  && read -p "OpenVPN tunnel interface [tun0]: " VPN_INIF
 [ -z "$VPN_INIF" ]  && VPN_INIF="tun0"
 
 [ ! -z "$VPN_OUTIF" ] && echo "VPN_OUTIF=$VPN_OUTIF"
-[ -z "$VPN_OUTIF" ] && read -p "OpenVPN output interface [eth0]: " VPN_OUTIF
+[ -z "$VPN_OUTIF" ] && read -p "OpenVPN physical interface [eth0]: " VPN_OUTIF
 [ -z "$VPN_OUTIF" ] && VPN_OUTIF="eth0"
 
 [ ! -z "$VPN_NET" ] && echo "VPN_NET=$VPN_NET"