X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=class%2F50-host-classes;h=6bdacd9afca82d641adaf73a87679182e6c5e5a8;hp=09815f8c3449349480adbefd15e09e56ae576342;hb=85b436e1f977caea6a31c340b67122d0fa274677;hpb=8504011bbff664feed016a00a996379c7efb8999

diff --git a/class/50-host-classes b/class/50-host-classes
index 09815f8..6bdacd9 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)
@@ -23,11 +24,14 @@ case $HOSTNAME in
     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 DISKLESS XORG TRISQUEL WORKSTATION FSF"
-        nogrub=1 ;&
-    freestation04)
-        echo "MV FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN"
         nogrub=1 ;;
     freetop-x60*)
 	echo "FAIBASE DHCPC XORG TRISQUEL WORKSTATION FSF"
@@ -36,8 +40,39 @@ case $HOSTNAME in
 	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
+	;;
     *)  
-        echo "FAIBASE DHCPC DEMO XORG GNOME";;
+        echo "FAIBASE" ;;
+	nogrub=1 
 esac
 
 if [ $nogrub -eq 0 ]; then