Merge branch 'master' into sudoman-mods
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 21 Dec 2015 16:51:10 +0000 (11:51 -0500)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 21 Dec 2015 16:51:10 +0000 (11:51 -0500)
class/50-host-classes
package_config/3DPRINT [new file with mode: 0644]
package_config/FAIBASE
package_config/ZONEMINDER [new file with mode: 0644]

index 7720771..9d5257b 100755 (executable)
@@ -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
@@ -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
+
index 1b4c197..c563eb1 100644 (file)
@@ -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
@@ -0,0 +1,3 @@
+PACKAGES aptitude
+zoneminder
+zoneminder-doc