X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=class%2F50-host-classes;h=3a2c4210ee0a4566e3b144103b1d3cff65ee309e;hp=e33c54c210d500ece79d820ac860105ca7c3d8cc;hb=f6df7b87518f30aed0e021f595c6fd303fdaa42d;hpb=fa9db26775fface001e309d5c5261174c0d35c66

diff --git a/class/50-host-classes b/class/50-host-classes
index e33c54c..3a2c421 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -6,8 +6,9 @@ nogrub=0
 
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in
-    faiserver)
-        echo "FAIBASE DEMO FAISERVER" ;;
+    faiserver*)
+	echo "FAIBASE FAISEVER SYSADMIN VM"
+        nogrub=1 ;;
     demohost)
         echo "FAIBASE DHCPC DEMO" ;;
     rms)
@@ -20,14 +21,63 @@ case $HOSTNAME in
         echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
     puma)
         echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
+    diskstation*)
+	echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
+        nogrub=1 ;;
+    freestation7)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
+        nogrub=1 ;;
+    freestation06)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN JAPANESE"
+        nogrub=1 ;;
     freestation*)
-        echo "FAIBASE DHCPC DISKLESS XORG TRISQUEL WORKSTATION FSF"
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         nogrub=1 ;;
     freetop-x60*)
 	echo "FAIBASE DHCPC XORG TRISQUEL WORKSTATION FSF"
 	;;
+    iwikiserver*)
+	echo "FAIBASE IKIWIKI SYSADMIN VM"
+	nogrub=1
+	;;
+    jobserver*)
+        echo "FAIBASE JOB SYSADMIN VM"
+        nogrub=1
+        ;;
+    mysqlserver*)
+        echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
+        nogrub=1
+        ;;
+    streamstation*)
+        echo "FAIBASE DHCPC SYSADMIN STREAM LIBREPLANET"
+        ;;
+    freetop*)
+        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
+        ;;
+    mwikiserver*)
+	echo "FAIBASE MEDIAWIKI SYSADMIN VM"
+	nogrub=1
+	;;
+    printserver*)
+	echo "FAIBASE CUPS SYSADMIN VM"
+	nogrub=1
+	;;
+    crmserver*)
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM"
+	nogrub=1
+	;;
+    crmdevserver*)
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
+	nogrub=1
+	;;
+    gnusocial*)
+	echo "FAIBASE WWW SYSADMIN VM MYSQLD"
+	nogrub=1
+	;;
     *)  
-        echo "FAIBASE DHCPC DEMO XORG GNOME";;
+        echo "FAIBASE"
+	nogrub=1 
+	;;
 esac
 
 if [ $nogrub -eq 0 ]; then