[Debconf-video-commits] r179 - in fai-config: class package_config

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-05 19:18:21 +0000 (Tue, 05 Aug 2008)
New Revision: 179

Modified:
   fai-config/class/28-debconf8-classes
   fai-config/package_config/VIDEO
Log:
clean up classes and packages, add lisa

Modified: fai-config/class/28-debconf8-classes
===================================================================
--- fai-config/class/28-debconf8-classes	2008-08-05 18:58:57 UTC (rev 178)
+++ fai-config/class/28-debconf8-classes	2008-08-05 19:18:21 UTC (rev 179)
@@ -1,13 +1,13 @@
 #! /bin/sh
 
-# some classes for all hosts
-echo "FAIBASE DEBCONF VIDEO" 
-
 # assign classes for hosts at debconf8
 # `hostname -f` doesnt return proper results
 case $HOSTNAME in
-   selma|patty|itchy|scratchy|daffy|barney|mrwhite)
-		echo "DEBCONF8" ;;
+   selma|patty|itchy|scratchy|daffy|barney|mrwhite|lisa)
+		echo "FAIBASE DEBCONF DEBCONF8 VIDEO" ;;
+   # lisa just has icecast, see below
+   lisa)
+   		echo "FAIBASE DEBCONF DEBCONF8"
 esac
 
 case $HOSTNAME in
@@ -15,7 +15,6 @@
    		echo "XORG";;
 esac
 
-
 case $HOSTNAME in
    daffy) 
    		echo "ENCODING";;
@@ -23,12 +22,13 @@
    		echo "CAPTURE";;
    mrwhite)
    		echo "REVIEW";;
+   lisa)
+   		echo "ICECAST";;
 esac
+# "barney" is its own class
 
 case $HOSTNAME in
    selma|scratchy) 
    		echo "DVSWITCH";;
 esac
 
-
-

Modified: fai-config/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO	2008-08-05 18:58:57 UTC (rev 178)
+++ fai-config/package_config/VIDEO	2008-08-05 19:18:21 UTC (rev 179)
@@ -4,6 +4,7 @@
 PACKAGES install VIDEO
 munin-node
 mailutils postfix logcheck
+debconf-video-common
 
 PACKAGES install XORG
 x-window-system elinks
@@ -14,9 +15,7 @@
 
 PACKAGES install DVSWITCH
 dvswitch
-debconf-video-common
 debconf-video-switch
-ffmpeg2theora oggfwd icecast2
 
 PACKAGES install REVIEW
 totem mplayer xine-ui vlc
@@ -25,26 +24,23 @@
 dvgrab dvsource
 
 PACKAGES install ENCODING
-ffmpeg
+ffmpeg ffmpeg2theora oggfwd 
 dvsink
 debconf-video-encode
 oggshout
 
 PACKAGES install barney
 dvsink
-debconf-video-common
 debconf-video-store
 nfs-kernel-server
 debian-keyring apache2
+ezstream
 
-PACKAGES install lisa
+PACKAGES install ICECAST
 icecast2
 
-PACKAGES install krabappel
-icecast2
+#unused:
+#PACKAGES install BRIDGE
+#bridge-utils
 
 
-PACKAGES install BRIDGE
-bridge-utils
-
-