X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=class%2F50-host-classes;h=bac598cd16c49dac27cbbd4f549ee41eea27a3e0;hp=3cd2ba49b8f3e1a016d175f9f51f30aa5bb06ddc;hb=27c53dc1b0dd67c384f5df9c7d622777ee8b7c92;hpb=7b236e33d4d2db317d11c16d5c8ec5652cd5bbad

diff --git a/class/50-host-classes b/class/50-host-classes
index 3cd2ba4..bac598c 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -2,69 +2,80 @@
 . /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 FAISEVER SYSADMIN VM"
-        nogrub=1 ;;
+        ;;
     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"
-        nogrub=1 ;;
+        ;;
     freestation06)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN JAPANESE"
-        nogrub=1 ;;
+        ;;
     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"
-        nogrub=1
         ;;
     mysqlserver*)
         echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
-        nogrub=1
         ;;
     streamstation*)
-        echo "FAIBASE DHCPC SYSADMIN STREAM LIBREPLANET"
+        echo "FAIBASE $GRUB DHCPC SYSADMIN STREAM LIBREPLANET"
         ;;
     freetop*)
-        echo "FAIBASE DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
+        echo "FAIBASE $GRUB DHCPC SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
         ;;
     mwikiserver*)
 	echo "FAIBASE MEDIAWIKI SYSADMIN VM"
-	nogrub=1
 	;;
+    printserver*)
+	echo "FAIBASE CUPS SYSADMIN VM"
+	;;
+    crmserver*)
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM"
+	;;
+    crmdevserver*)
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
+	;;
+    gnusocial*)
+	echo "FAIBASE WWW SYSADMIN VM MYSQLD"
+	;;
+    ploneserver*)
+	echo "FAIBASE WWW SYSADMIN VM MYSQLD PLONE"
+	;;
+    nagios*)
+	echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW
     *)  
-
-        echo "FAIBASE";;
+        echo "FAIBASE"
+	;;
 esac
 
-if [ $nogrub -eq 0 ]; then
-    (ifclass I386 || ifclass AMD64) && echo GRUB_PC
-fi
-
 exit 0