Merge pull request #27 from westfeld/fix_hostname_regexp

correct hostname regexp fixes issue #24
terem42 · Jan 29, 2022 · c2bd033 · c2bd033
2 parents dc72f24 + 2592d74
commit c2bd033
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh
@@ -381,7 +381,7 @@ function ask_hostname {
 
   local hostname_invalid_message=
 
-  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
+  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z0-9_:.-]+$ ]]; do
     v_hostname=$(dialog --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
 
     hostname_invalid_message="Invalid host name! "

diff --git a/hetzner-debian11-zfs-setup.sh b/hetzner-debian11-zfs-setup.sh
@@ -382,7 +382,7 @@ function ask_hostname {
 
   local hostname_invalid_message=
 
-  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
+  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z0-9_:.-]+$ ]]; do
     v_hostname=$(dialog --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
 
     hostname_invalid_message="Invalid host name! "

diff --git a/hetzner-ubuntu18-zfs-setup.sh b/hetzner-ubuntu18-zfs-setup.sh
@@ -346,7 +346,7 @@ function ask_hostname {
 
   local hostname_invalid_message=
 
-  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
+  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z0-9_:.-]+$ ]]; do
     v_hostname=$(dialog --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
 
     hostname_invalid_message="Invalid host name! "

diff --git a/hetzner-ubuntu20-zfs-setup.sh b/hetzner-ubuntu20-zfs-setup.sh
@@ -346,7 +346,7 @@ function ask_hostname {
 
   local hostname_invalid_message=
 
-  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z_:.-]+$ ]]; do
+  while [[ ! $v_hostname =~ ^[a-z][a-zA-Z0-9_:.-]+$ ]]; do
     v_hostname=$(dialog --inputbox "${hostname_invalid_message}Set the host name" 30 100 "$c_default_hostname" 3>&1 1>&2 2>&3)
 
     hostname_invalid_message="Invalid host name! "