X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=class%2F50-host-classes;h=0410e0ea7537c680786177d90e59596c4a13e895;hp=34d90c2b60880617bba47fa20f6a808eb159af67;hb=fcd39e0418d842875df7a50409addc44748fa96d;hpb=83b1b8c17f79132a0d59b95eb9f62aa9ec4667f4

diff --git a/class/50-host-classes b/class/50-host-classes
index 34d90c2..0410e0e 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -9,20 +9,14 @@ fi
 # use a list of classes for our demo machine                                                                                                   
 case $HOSTNAME in
     faiserver*)
-	echo "FAIBASE FAISEVER SYSADMIN VM"
+	echo "FAIBASE FAISERVER SYSADMIN VM"
+        ;;
+    nekohost)
+        echo "FAIBASE $GRUB DHCPC DEMO"
         ;;
-    demohost)
-        echo "FAIBASE $GRUB DHCPC DEMO" ;;
     rms)
-        echo "FAIBASE $GRUB DHCPC DEMO XORG TRISQUEL RMS";;
-    gnomehost)
-        echo "FAIBASE $GRUB DHCPC DEMO XORG GNOME";;
-    atom*)
-        echo "FAIBASE $GRUB DHCPC DEMO" ;;
-    bear)
-        echo "FAIBASE $GRUB DHCPC LVM_XEN_SERVER XEN" ;;
-    puma)
-        echo "FAIBASE $GRUB DHCPC RAID_XEN_VIRTUAL" ;;
+        echo "FAIBASE $GRUB DHCPC DEMO XORG TRISQUEL RMS"
+	;;
     diskstation*)
 	echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
         ;;
@@ -36,11 +30,14 @@ case $HOSTNAME in
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         ;;
     zoneminder*)
-	echo "FAIBASE DISKLESS SYSADMIN FSF ZONEMINDER"
+	echo "FAIBASE SYSADMIN FSF ZONEMINDER MYSQLD"
         ;;
     freetop-x60*)
 	echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF"
 	;;
+    contop*)
+	echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF CONTOP"
+	;;
     iwikiserver*)
 	echo "FAIBASE IKIWIKI SYSADMIN VM"
 	;;
@@ -51,10 +48,22 @@ case $HOSTNAME in
         echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
         ;;
     streamstation*)
-        echo "FAIBASE $GRUB SYSADMIN STREAM LIBREPLANET"
+        echo "FAIBASE $GRUB SYSADMIN STREAM XORG TRISQUEL LPCONF"
+	;;
+    streamtop*)
+        echo "FAIBASE $GRUB SYSADMIN STREAM XORG TRISQUEL LAPTOP LPCONF"
         ;;
     freetop*)
-        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET 3DPRINT"
+        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LAPTOP 3DPRINT"
+        ;;
+    sfreetop*)
+        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LAPTOP 3DPRINT LUKS ECRYPTFS"
+        ;;
+    cloud*)
+	echo "FAIBASE VM SYSADMIN TRISQUEL"
+	;;
+    libretop*)
+        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LAPTOP LPCONF"
         ;;
     mwikiserver*)
 	echo "FAIBASE MEDIAWIKI SYSADMIN VM"
@@ -66,7 +75,7 @@ case $HOSTNAME in
 	echo "FAIBASE CUPS SYSADMIN VM"
 	;;
     crmserver*)
-	echo "FAIBASE WWW CIVICRM SYSADMIN VM"
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM LETSENCRYPT"
 	;;
     crmdevserver*)
 	echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
@@ -78,14 +87,26 @@ case $HOSTNAME in
 	echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW"
 	;;
     shopserver*)
-	echo "FAIBASE SYSADMIN KOSA MARIADB WWW"
+	echo "FAIBASE SYSADMIN KOSA MARIADB WWW LETSENCRYPT"
 	;;
     kdev*)
 	echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW"
 	;;
+    dcimserver*)
+	echo "FAIBASE SYSADMIN VM WWW MYSQLD ODCIM"
+	;;
+    irc*)
+	echo "FAIBASE SYSADMIN KOSA SYSADMIN VM WWW LETSENCRYPT IRC"
+	;;
     glamp*)
 	echo "FAIBASE MYSQLD PHP5 SYSADMIN WWW"
 	;;
+    gmg*libreplanet.org)
+	echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT LIBREPLANET"
+	;;
+    gmg*)
+	echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT"
+	;;
     *)  
         echo "FAIBASE"
 	;;