mirror of
https://github.com/gravitl/netmaker.git
synced 2025-11-09 16:21:01 +08:00
Merge branch 'NET-39/bash-reformat' into NET-39/nm-quick-refactor
# Conflicts: # scripts/nm-quick.sh
This commit is contained in:
commit
b085a61aa6
1 changed files with 8 additions and 6 deletions
|
|
@ -576,13 +576,16 @@ set_install_vars() {
|
||||||
read -p "TURN Username (click 'enter' to use 'netmaker'): " GET_TURN_USERNAME
|
read -p "TURN Username (click 'enter' to use 'netmaker'): " GET_TURN_USERNAME
|
||||||
fi
|
fi
|
||||||
if [ -z "$GET_TURN_USERNAME" ]; then
|
if [ -z "$GET_TURN_USERNAME" ]; then
|
||||||
echo "using default username for mq"
|
echo "using default username for mq"
|
||||||
TURN_USERNAME="netmaker"
|
TURN_USERNAME="netmaker"
|
||||||
else
|
else
|
||||||
TURN_USERNAME="$GET_TURN_USERNAME"
|
TURN_USERNAME="$GET_TURN_USERNAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TURN_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 30 ; echo '')
|
TURN_PASSWORD=$(
|
||||||
|
tr -dc A-Za-z0-9 </dev/urandom | head -c 30
|
||||||
|
echo ''
|
||||||
|
)
|
||||||
|
|
||||||
if [ -z $AUTO_BUILD ]; then
|
if [ -z $AUTO_BUILD ]; then
|
||||||
select domain_option in "Auto Generated Password" "Input Your Own Password"; do
|
select domain_option in "Auto Generated Password" "Input Your Own Password"; do
|
||||||
|
|
@ -592,8 +595,7 @@ set_install_vars() {
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
2)
|
2)
|
||||||
while true
|
while true; do
|
||||||
do
|
|
||||||
echo "Enter your Password For TURN: "
|
echo "Enter your Password For TURN: "
|
||||||
read -s GET_TURN_PASSWORD
|
read -s GET_TURN_PASSWORD
|
||||||
echo "Enter your password again to confirm: "
|
echo "Enter your password again to confirm: "
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue