X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=class%2F50-host-classes;h=c4e1889d0a38803e385044b7d950ed2d595c9fff;hb=554338dae55f52c537d6df4b08db1044a0c93281;hp=e84caf9e4826d361e4515351884b697883c30e86;hpb=1f4c822b95acbbc9c6cde319659676bef7905e0e;p=fai-configs.git

diff --git a/class/50-host-classes b/class/50-host-classes
index e84caf9..c4e1889 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -2,43 +2,72 @@
 . /usr/lib/fai/subroutines
 # assign classes hosts                                                                                                                         
 
-nogrub=0
+if (ifclass I386 || ifclass AMD64) ; then
+    GRUB="GRUB_PC"
+fi
 
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in
-    faiserver)
-        echo "FAIBASE DEMO FAISERVER" ;;
+    faiserver*)
+	echo "FAIBASE FAISEVER SYSADMIN VM"
+        ;;
     demohost)
-        echo "FAIBASE DHCPC DEMO" ;;
+        echo "FAIBASE $GRUB DHCPC DEMO" ;;
     rms)
-        echo "FAIBASE DHCPC DEMO XORG TRISQUEL RMS";;
+        echo "FAIBASE $GRUB DHCPC DEMO XORG TRISQUEL RMS";;
     gnomehost)
-        echo "FAIBASE DHCPC DEMO XORG GNOME";;
+        echo "FAIBASE $GRUB DHCPC DEMO XORG GNOME";;
     atom*)
-        echo "FAIBASE DHCPC DEMO" ;;
+        echo "FAIBASE $GRUB DHCPC DEMO" ;;
     bear)
-        echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
+        echo "FAIBASE $GRUB DHCPC LVM_XEN_SERVER XEN" ;;
     puma)
-        echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
+        echo "FAIBASE $GRUB DHCPC RAID_XEN_VIRTUAL" ;;
     diskstation*)
 	echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
-        nogrub=1 ;;
+        ;;
+    freestation7)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
+        ;;
+    freestation06)
+        echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN JAPANESE"
+        ;;
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
-        nogrub=1 ;;
+        ;;
     freetop-x60*)
-	echo "FAIBASE DHCPC XORG TRISQUEL WORKSTATION FSF"
+	echo "FAIBASE $GRUB DHCPC XORG TRISQUEL WORKSTATION FSF"
 	;;
     iwikiserver*)
 	echo "FAIBASE IKIWIKI SYSADMIN VM"
-	nogrub=1
+	;;
+    jobserver*)
+        echo "FAIBASE JOB SYSADMIN VM"
+        ;;
+    mysqlserver*)
+        echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
+        ;;
+    streamstation*)
+        echo "FAIBASE $GRUB DHCPC SYSADMIN STREAM LIBREPLANET"
+        ;;
+    freetop*)
+        echo "FAIBASE $GRUB DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
+        ;;
+    mwikiserver*)
+	echo "FAIBASE MEDIAWIKI SYSADMIN VM"
+	;;
+    printserver*)
+	echo "FAIBASE CUPS SYSADMIN VM"
+	;;
+    crmserver*)
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM"
+	;;
+    crmdevserver*)
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
 	;;
     *)  
-        echo "FAIBASE DHCPC DEMO XORG GNOME";;
+        echo "FAIBASE"
+	;;
 esac
 
-if [ $nogrub -eq 0 ]; then
-    (ifclass I386 || ifclass AMD64) && echo GRUB_PC
-fi
-
 exit 0