[Debconf-video-commits] r731 - in fai-config: class files/etc/hosts

[Holger Levsen]

Author: holger
Date: 2012-02-03 10:19:28 +0000 (Fri, 03 Feb 2012)
New Revision: 731

Added:
   fai-config/class/29-fosdem2012-classes
Removed:
   fai-config/class/29-fosdem2009-classes
Modified:
   fai-config/files/etc/hosts/FOSDEM
Log:
fosdem preparations

Deleted: fai-config/class/29-fosdem2009-classes
===================================================================
--- fai-config/class/29-fosdem2009-classes	2011-11-06 21:57:27 UTC (rev 730)
+++ fai-config/class/29-fosdem2009-classes	2012-02-03 10:19:28 UTC (rev 731)
@@ -1,41 +0,0 @@
-#! /bin/sh
-
-# assign classes for hosts at fosdem 2009
-# `hostname -f` doesnt return proper results (before running fai :)
-
-#
-#
-exit 0
-
-case $HOSTNAME in
-   selma|patty|ned)
-		echo "FAIBASE DEBCONF VIDEO FOSDEM" ;;
-esac
-
-case $HOSTNAME in
-   selma) 
-   		echo "XORG";;
-esac
-
-case $HOSTNAME in
-   ned) 
-   		echo "ENCODING";;
-   selma|patty|ned) 
-   		echo "CAPTURE";;
-   ned)
-   		echo "ICECAST";;
-   selma)
-   		echo "STORAGE";;
-esac
-
-case $HOSTNAME in
-   selma) 
-   		echo "DVSWITCH";;
-esac
-
-case $HOSTNAME in 
-   selma|patty|ned)
-   		echo "DVSWITCHPUBKEY";;
-esac
-
-

Copied: fai-config/class/29-fosdem2012-classes (from rev 722, fai-config/class/29-fosdem2009-classes)
===================================================================
--- fai-config/class/29-fosdem2012-classes	                        (rev 0)
+++ fai-config/class/29-fosdem2012-classes	2012-02-03 10:19:28 UTC (rev 731)
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+# assign classes for hosts at fosdem 2012
+# `hostname -f` doesnt return proper results (before running fai :)
+
+#
+#
+
+case $HOSTNAME in
+   r?grab|r?dvswitch)
+		echo "FAIBASE DEBCONF VIDEO FOSDEM" ;;
+esac
+
+case $HOSTNAME in
+   r?dvswitch) 
+   		echo "XORG";;
+esac
+
+case $HOSTNAME in
+#   ned) 
+#   		echo "ENCODING";;
+   r?grab) 
+   		echo "CAPTURE";;
+#   ned)
+#   		echo "ICECAST";;
+esac
+
+case $HOSTNAME in
+   r?dvswitch) 
+   		echo "DVSWITCH STORAGE";;
+esac
+
+case $HOSTNAME in 
+   r?grab|r?dvswitch)
+   		echo "DVSWITCHPUBKEY";;
+esac
+
+

Modified: fai-config/files/etc/hosts/FOSDEM
===================================================================
--- fai-config/files/etc/hosts/FOSDEM	2011-11-06 21:57:27 UTC (rev 730)
+++ fai-config/files/etc/hosts/FOSDEM	2012-02-03 10:19:28 UTC (rev 731)
@@ -1,11 +1,28 @@
 127.0.0.1 localhost
 
-82.195.75.74 	apu.debconf.org 
-192.168.0.254	linksys.debconf.org linksys
-192.168.0.1	patty.debconf.org patty
-192.168.0.2	selma.debconf.org selma
-192.168.0.3	ned.debconf.org ned
+# janson
+193.191.80.10 r1grab
+193.191.80.11 r1dvswitch
+# ferrer
+193.191.80.20 r2grab
+193.191.80.21 r2dvswitch
+# K
+193.191.80.30 r3grab
+193.191.80.31 r3dvswitch
+# h1301
+193.191.80.40 r4grab
+193.191.80.41 r4dvswitch
+# h1302
+193.191.80.50 r5grab
+193.191.80.51 r5dvswitch
 
+# encoding
+193.191.81.11  flumo1
+193.191.81.12  flumo2
+193.191.81.13  flumo3 celtic # (wouter's old laptop, not rented) 
+
+193.191.95.254 gateway
+
 # The following lines are desirable for IPv6 capable hosts
 ::1 ip6-localhost ip6-loopback
 fe00::0 ip6-localnet