Account for hostname suffixes when abbreviating for labels

files/scripts/install.sh

@@ -283,8 +283,13 @@ END
             ;;
     esac
 
+
+    if [[ $name =~ ([0-9]+)$ ]]; then
+        suffix="${BASH_REMATCH[1]}"
+    fi
+
     if (( ${#name} > 8 )); then
-        labelname="${name:0:4}${name: -4}"
+        labelname="${name:0:$((8 - ${#suffix}))}${suffix}"
     else
         labelname="$name"
     fi

manifests/base/fstab.pp

 class nest::base::fstab {
   $hostname = regsubst($::trusted['certname'], '\..*', '')
 
+  $suffix = $hostname ? {
+    /(\d+)$/ => "$1",
+    default  => '',
+  }
+
   if length($hostname) > 8 {
-    $labelname = "${hostname[0,4]}${hostname[-4,4]}"
+    $labelname = "${hostname[0,8 - $suffix.length]}${suffix}"
   } else {
     $labelname = $hostname
   }