From: Ian Kelling <iank@fsf.org>
Date: Mon, 31 Jul 2017 16:27:49 +0000 (-0700)
Subject: make workstations get gui emacs, others have non-gui
X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=commitdiff_plain;h=47cf7814a29fe08e5c4f20bc0ef245dccb482b7b

make workstations get gui emacs, others have non-gui
---

diff --git a/class/50-host-classes b/class/50-host-classes
index 78a42b2..0af267d 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -11,16 +11,16 @@ fi
 
 case $HOSTNAME in
     faiserver*)
-	echo "FAIBASE FAISERVER SYSADMIN VM"
+	echo "FAIBASE FAISERVER SYSADMIN VM HEADLESS"
         ;;
     nekohost)
-        echo "FAIBASE $GRUB DHCPC DEMO"
+        echo "FAIBASE $GRUB DHCPC DEMO HEADLESS"
         ;;
     rms)
         echo "FAIBASE $GRUB DHCPC DEMO XORG TRISQUEL RMS"
 	;;
     diskstation*)
-	echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF"
+	echo "FAIBASE DISKLESS DISKTOOLS SYSADMIN FSF HEADLESS"
         ;;
     freestation7)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF SYSADMIN MV"
@@ -32,7 +32,7 @@ case $HOSTNAME in
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         ;;
     zoneminder*)
-	echo "FAIBASE SYSADMIN FSF ZONEMINDER MYSQLD"
+	echo "FAIBASE SYSADMIN FSF ZONEMINDER MYSQLD HEADLESS"
 	;;
     freetop-x60*)
 	echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF"
@@ -41,19 +41,16 @@ case $HOSTNAME in
 	echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF CONTOP"
 	;;
     iwikiserver*)
-	echo "FAIBASE IKIWIKI SYSADMIN VM"
+	echo "FAIBASE IKIWIKI SYSADMIN VM HEADLESS"
 	;;
     jobserver*)
-        echo "FAIBASE JOB SYSADMIN VM"
+        echo "FAIBASE JOB SYSADMIN VM HEADLESS"
         ;;
     mysqlserver*)
-        echo "FAIBASE KVMGUEST SYSADMIN MYSQLD"
+        echo "FAIBASE KVMGUEST SYSADMIN MYSQLD HEADLESS"
         ;;
     streamstation*)
-        echo "FAIBASE $GRUB SYSADMIN STREAM XORG TRISQUEL LPCONF"
-	;;
-    streamtop*)
-        echo "FAIBASE $GRUB SYSADMIN STREAM XORG TRISQUEL LAPTOP LPCONF"
+        echo "FAIBASE $GRUB SYSADMIN STREAM XORG TRISQUEL LPCONF HEADLESS"
         ;;
     freetop*)
         echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LAPTOP 3DPRINT"
@@ -62,64 +59,64 @@ case $HOSTNAME in
         echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LAPTOP 3DPRINT LUKS ECRYPTFS"
         ;;
     cloud*)
-	echo "FAIBASE VM SYSADMIN TRISQUEL"
+	echo "FAIBASE VM SYSADMIN TRISQUEL HEADLESS"
 	;;
     libretop*)
         echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LAPTOP LPCONF"
         ;;
     mwikiserver*)
-	echo "FAIBASE MEDIAWIKI SYSADMIN VM"
+	echo "FAIBASE MEDIAWIKI SYSADMIN VM HEADLESS"
 	;;
     ploneserver*)
-	echo "FAIBASE PLONE SYSADMIN VM"
+	echo "FAIBASE PLONE SYSADMIN VM HEADLESS"
 	;;
     printserver*)
-	echo "FAIBASE CUPS SYSADMIN VM"
+	echo "FAIBASE CUPS SYSADMIN VM HEADLESS"
 	;;
     jabserver*)
-	echo "FAIBASE VM SYSADMIN LETSENCRYPT EJABBERD"
+	echo "FAIBASE VM SYSADMIN LETSENCRYPT EJABBERD HEADLESS"
         ;;
     crmserver*)
-	echo "FAIBASE WWW CIVICRM SYSADMIN VM LETSENCRYPT"
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM LETSENCRYPT HEADLESS"
 	;;
     crmdevserver*)
-	echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
+	echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD HEADLESS"
 	;;
     gnusocial*)
-	echo "FAIBASE WWW SYSADMIN VM MYSQLD GNUSOCIAL YOURLS"
+	echo "FAIBASE WWW SYSADMIN VM MYSQLD GNUSOCIAL YOURLS HEADLESS"
 	;;
     nagios*)
-	echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW"
+	echo "FAIBASE SYSADMIN VM MYSQLD NAGIOS WWW HEADLESS"
 	;;
     shopserver*)
-	echo "FAIBASE SYSADMIN KOSA MARIADB WWW LETSENCRYPT"
+	echo "FAIBASE SYSADMIN KOSA MARIADB WWW LETSENCRYPT HEADLESS"
 	;;
     kdev*)
-	echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW"
+	echo "FAIBASE SYSADMIN KOSA VM MYSQLD PLONE WWW HEADLESS"
 	;;
     dcimserver*)
-	echo "FAIBASE SYSADMIN VM WWW MYSQLD ODCIM"
+	echo "FAIBASE SYSADMIN VM WWW MYSQLD ODCIM HEADLESS"
 	;;
     irc*)
-	echo "FAIBASE SYSADMIN KOSA SYSADMIN VM WWW LETSENCRYPT IRC"
+	echo "FAIBASE SYSADMIN KOSA SYSADMIN VM WWW LETSENCRYPT IRC HEADLESS"
 	;;
     glamp*)
-	echo "FAIBASE MYSQLD PHP5 SYSADMIN WWW"
+	echo "FAIBASE MYSQLD PHP5 SYSADMIN WWW HEADLESS"
 	;;
     gmg*libreplanet.org)
-	echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT LIBREPLANET"
+	echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT LIBREPLANET HEADLESS"
 	;;
     gmg*)
-	echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT"
+	echo "FAIBASE VM PSQL GMG SYSADMIN LETSENCRYPT HEADLESS"
 	;;
     migration*)
-        echo "FAIBASE SYSADMIN"
+        echo "FAIBASE SYSADMIN HEADLESS"
         ;;
     rt*p.office*)
-        echo "FAIBASE SYSADMIN"
+        echo "FAIBASE SYSADMIN HEADLESS"
         ;;
     *)  
-        echo "FAIBASE"
+        echo "FAIBASE HEADLESS"
 	;;
 esac
 
diff --git a/package_config/FAIBASE b/package_config/FAIBASE
index 4136fcb..ff3888b 100644
--- a/package_config/FAIBASE
+++ b/package_config/FAIBASE
@@ -6,7 +6,6 @@ cron
 debconf-utils
 file
 hdparm
-emacs24-nox
 less
 linuxlogo
 nfs-common
diff --git a/package_config/HEADLESS b/package_config/HEADLESS
new file mode 100644
index 0000000..40f2960
--- /dev/null
+++ b/package_config/HEADLESS
@@ -0,0 +1,2 @@
+PACKAGES aptitude
+emacs24-nox
diff --git a/package_config/KOSA b/package_config/KOSA
index 5efcd37..0d3ecc7 100644
--- a/package_config/KOSA
+++ b/package_config/KOSA
@@ -5,7 +5,6 @@ ncdu
 unzip
 openssl
 htop
-emacs24-nox
 wget
 apache2 
 php-cas 
diff --git a/package_config/PLONE b/package_config/PLONE
index 8942f04..199951d 100644
--- a/package_config/PLONE
+++ b/package_config/PLONE
@@ -19,4 +19,3 @@ wv
 nginx-full
 nginx-extras
 nano
-emacs24-nox
diff --git a/package_config/SYSADMIN b/package_config/SYSADMIN
index 982d1fe..179d9db 100644
--- a/package_config/SYSADMIN
+++ b/package_config/SYSADMIN
@@ -1,5 +1,4 @@
 PACKAGES aptitude SYSADMIN
-emacs24-nox
 screen
 curl
 vim
diff --git a/package_config/WORKSTATION b/package_config/WORKSTATION
index 9ae8390..c88d57b 100644
--- a/package_config/WORKSTATION
+++ b/package_config/WORKSTATION
@@ -8,7 +8,7 @@ gnome-calculator
 pidgin
 thunderbird
 enigmail
-emacs
+emacs24
 pidgin-otr
 git
 subversion