diff --git a/roles/openvpn/templates/iiab-support b/roles/openvpn/templates/iiab-support index 784327d31..3c49e95fe 100755 --- a/roles/openvpn/templates/iiab-support +++ b/roles/openvpn/templates/iiab-support @@ -55,17 +55,19 @@ if $($DEBUG); then echo -e "/etc/iiab/local_vars.yml shows:\n" grep "^openvpn_" /etc/iiab/local_vars.yml echo - echo "Your OpenVPN machine name -- source: $handle" + echo "Your OpenVPN machine name--direct from source: $handle" fi # Preview of steps (5) and (6) -echo -ne "\e[1mYour OpenVPN machine name is set to: \e[100m" +# echo -ne "\e[1mYour OpenVPN machine name is set to: \e[100m" +echo -ne "Your OpenVPN machine name (openvpn_handle) is: \e[32m" echo -n "$handle" | sed "s/^\(['\"]\)\(.*\)\1$/\2/; s/ /_/g" # Avoid '-e' interpreting backlash escapes, to show var accurately! Double quote var to prevent field splitting (eats spaces) -echo -e "\e[0m\n" # Separate line also for trailing backslash in var +vpnip=$(ip a | grep tun0$ | awk '{print $2}') +echo -e "\e[0m\nYour OpenVPN IP address (which can change) is: \e[32m$vpnip\e[0m\n" # Separate line from above, also in case of trailing backslash in $handle echo -e "\e[1mPlease type a descriptive OpenVPN machine name (openvpn_handle) such as:\n" -echo -e " cape-town-school-36-rpi-2019-05-31\n" +echo -e " cape-town-school-36-rpi-2021-09-01\n" echo -en "Or hit [Enter] to keep the existing name:\e[0m " read ans < /dev/tty # Strips outer whitespace, whether we like it or not! @@ -76,7 +78,7 @@ if [ "$ans" = "" ]; then # (A) Simple! Writes to local_vars.yml a bit more o echo -e "\n \e[100mopenvpn_handle REMAINS UNCHANGED IN /etc/iiab/local_vars.yml\e[0m\n" else if grep -q '^openvpn_handle:' /etc/iiab/local_vars.yml; then - sed -i "s/^openvpn_handle:.*/openvpn_handle: $ans/" /etc/iiab/local_vars.yml + sed -i "s/^openvpn_handle:.*/openvpn_handle: $ans/" /etc/iiab/local_vars.yml # Beware if user insists on input "\\", error is "sed: -e expression #1, char 39: unterminated `s' command" else echo "openvpn_handle: $ans" >> /etc/iiab/local_vars.yml fi