Merge branch 'master' into sudoman-mods

diff --git a/class/50-host-classes b/class/50-host-classes
index 77207714aea69ba1a3207fb95caa66a403c3e0b2..9d5257b22b4a3c60e044354a40475afb510ddb8f 100755 (executable)
--- 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 SYSADMIN 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 (file)
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 1b4c197fba7f666a12d8a043003e0ac33b624bf8..c563eb1bdcd007feaaa8622143dfffeb9f4aeedc 100644 (file)
--- a/package_config/FAIBASE
+++ b/package_config/FAIBASE
@@ -40,3 +40,5 @@ uptimed
 rdiff-backup
 kpartx
 language-pack-en-base
+mutt
+tree

diff --git a/package_config/ZONEMINDER b/package_config/ZONEMINDER
new file mode 100644 (file)
index 0000000..71315dc
--- /dev/null
+++ b/package_config/ZONEMINDER
@@ -0,0 +1,3 @@
+PACKAGES aptitude
+zoneminder
+zoneminder-doc