From: John Dulaney <jdulaney@fedoraproject.org>
Date: Thu, 24 Dec 2015 17:40:32 +0000 (-0500)
Subject: Merge branch 'master' of vcs.fsf.org:fai-configs
X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=commitdiff_plain;h=07c7b1053878012e9be8c19218f71ef14375dd08;hp=78970a68900f633ec601ef63c9d589671fc77ef3

Merge branch 'master' of vcs.fsf.org:fai-configs
---

diff --git a/class/50-host-classes b/class/50-host-classes
index 7720771..302028d 100755
--- a/class/50-host-classes
+++ b/class/50-host-classes
@@ -35,6 +35,9 @@ case $HOSTNAME in
     freestation*)
         echo "FAIBASE DISKLESS XORG TRISQUEL WORKSTATION FSF"
         ;;
+    zoneminder*)
+	echo "FAIBASE DISKLESS SYSADMIN FSF ZONEMINDER"
+        ;;
     freetop-x60*)
 	echo "FAIBASE $GRUB NW_MGR XORG TRISQUEL WORKSTATION FSF"
 	;;
@@ -51,7 +54,7 @@ case $HOSTNAME in
         echo "FAIBASE $GRUB SYSADMIN STREAM LIBREPLANET"
         ;;
     freetop*)
-        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET"
+        echo "FAIBASE $GRUB NW_MGR SYSADMIN XORG TRISQUEL WORKSTATION LIBREPLANET 3DPRINT"
         ;;
     mwikiserver*)
 	echo "FAIBASE MEDIAWIKI SYSADMIN VM"
diff --git a/package_config/3DPRINT b/package_config/3DPRINT
new file mode 100644
index 0000000..2335023
--- /dev/null
+++ b/package_config/3DPRINT
@@ -0,0 +1,13 @@
+PACKAGES aptitude
+
+python-serial
+python-wxgtk2.8
+python-pyglet
+python-numpy
+cython
+python-libxml2
+python-gobject
+python-dbus
+python-psutil
+git
+
diff --git a/package_config/FAIBASE b/package_config/FAIBASE
index 1b4c197..b0c91c7 100644
--- a/package_config/FAIBASE
+++ b/package_config/FAIBASE
@@ -40,3 +40,6 @@ uptimed
 rdiff-backup
 kpartx
 language-pack-en-base
+mutt
+tree
+iputils-tracepath
diff --git a/package_config/WORKSTATION b/package_config/WORKSTATION
index df8286a..f8a207b 100644
--- a/package_config/WORKSTATION
+++ b/package_config/WORKSTATION
@@ -25,3 +25,4 @@ vim
 screen
 tmux
 mosh
+file-roller
diff --git a/package_config/ZONEMINDER b/package_config/ZONEMINDER
new file mode 100644
index 0000000..71315dc
--- /dev/null
+++ b/package_config/ZONEMINDER
@@ -0,0 +1,3 @@
+PACKAGES aptitude
+zoneminder
+zoneminder-doc