[Debconf-video-commits] r440 - package/trunk/conf/dc9

[Holger Levsen]

Author: holger
Date: 2009-06-21 09:33:25 +0000 (Sun, 21 Jun 2009)
New Revision: 440

Removed:
   package/trunk/conf/dc9/default-io
Modified:
   package/trunk/conf/dc9/default-barney
   package/trunk/conf/dc9/default-daffy
   package/trunk/conf/dc9/default-lisa
   package/trunk/conf/dc9/default-scratchy
   package/trunk/conf/dc9/default-selma
Log:
update for dc9. does stuff like VENUE_NAME has to be set always or is it taken from default else?

Modified: package/trunk/conf/dc9/default-barney
===================================================================
--- package/trunk/conf/dc9/default-barney	2009-06-21 09:29:12 UTC (rev 439)
+++ package/trunk/conf/dc9/default-barney	2009-06-21 09:33:25 UTC (rev 440)
@@ -1,6 +1,6 @@
 # Name of the location from which we are recording
-CONFERENCE_NAME='DebConf8'
-VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
+CONFERENCE_NAME='DebConf9'
+VENUE_NAME="Residencia Muñoz Torrero, Cáceres, Spain"
 # Database access (pygresql)
 DATABASE_DSN="skinner.debconf.org:pentabarf"
 DATABASE_USER=dc7video
@@ -8,5 +8,5 @@
 # File store base directory
 FILE_BASE="/video"
 ENCODING_HOSTS="daffy"
-PUBLICATION_PATH="apu.debconf.org:/dvd/2008/debconf8"
+PUBLICATION_PATH="apu.debconf.org:/dvd/2009/debconf9"
 

Modified: package/trunk/conf/dc9/default-daffy
===================================================================
--- package/trunk/conf/dc9/default-daffy	2009-06-21 09:29:12 UTC (rev 439)
+++ package/trunk/conf/dc9/default-daffy	2009-06-21 09:33:25 UTC (rev 440)
@@ -1,12 +1,12 @@
 # Name of the location from which we are recording
-CONFERENCE_NAME='DebConf8'
-VENUE_NAME="unknown venue"
+CONFERENCE_NAME='DebConf9'
+VENUE_NAME="Residencia Muñoz Torrero, Cáceres, Spain"
 ROOM_NAME="unknown room"
 # Sources and sinks
 SOURCES="firewire:localhost"
 SINKS="file:localhost"
 # Icecast streaming server parameters
-ICECAST_ADDR=lisa.dc8.video.debconf.org
+ICECAST_ADDR=lisa.dc9.video.debconf.org
 ICECAST_PORT=8000
 ICECAST_PASS=#ICECAST_PASS#
 # Stream encoding parameters

Deleted: package/trunk/conf/dc9/default-io
===================================================================
--- package/trunk/conf/dc9/default-io	2009-06-21 09:29:12 UTC (rev 439)
+++ package/trunk/conf/dc9/default-io	2009-06-21 09:33:25 UTC (rev 440)
@@ -1,12 +0,0 @@
-# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf8'
-VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-# Database access (pygresql)
-DATABASE_DSN="skinner.debconf.org:pentabarf"
-DATABASE_USER=dc7video
-DATABASE_PASSWORD=#DATABASE_PASSWORD#
-# File store base directory
-FILE_BASE="/video"
-ENCODING_HOSTS="io*1"
-PUBLICATION_PATH="apu.debconf.org:/dvd/2008/debconf8"
-

Modified: package/trunk/conf/dc9/default-lisa
===================================================================
--- package/trunk/conf/dc9/default-lisa	2009-06-21 09:29:12 UTC (rev 439)
+++ package/trunk/conf/dc9/default-lisa	2009-06-21 09:33:25 UTC (rev 440)
@@ -1,6 +1,6 @@
 # Name of the location from which we are recording
-CONFERENCE_NAME='DebConf8'
-VENUE_NAME="unknown venue"
+CONFERENCE_NAME='DebConf9'
+VENUE_NAME="Residencia Muñoz Torrero, Cáceres, Spain"
 ROOM_NAME="unknown room"
 # Sources and sinks
 SOURCES="firewire:localhost"

Modified: package/trunk/conf/dc9/default-scratchy
===================================================================
--- package/trunk/conf/dc9/default-scratchy	2009-06-21 09:29:12 UTC (rev 439)
+++ package/trunk/conf/dc9/default-scratchy	2009-06-21 09:33:25 UTC (rev 440)
@@ -1,11 +1,12 @@
 # Name of the location from which we are recording
-VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-ROOM_NAME="Microcine"
+CONFERENCE_NAME='DebConf9'
+VENUE_NAME="Residencia Muñoz Torrero, Cáceres, Spain"
+ROOM_NAME="Lower talkroom"
 # Sources and sinks
 SOURCES="firewire:scratchy firewire:itchy/0 firewire:itchy/1"
 SINKS="icecast:daffy file:barney"
 # Icecast streaming server parameters
-ICECAST_ADDR=lisa.dc8.debconf.org
+ICECAST_ADDR=lisa.dc9.debconf.org
 ICECAST_PORT=8000
 ICECAST_PASS=#ICECAST_PASS#
 # Stream encoding parameters

Modified: package/trunk/conf/dc9/default-selma
===================================================================
--- package/trunk/conf/dc9/default-selma	2009-06-21 09:29:12 UTC (rev 439)
+++ package/trunk/conf/dc9/default-selma	2009-06-21 09:33:25 UTC (rev 440)
@@ -1,11 +1,12 @@
 # Name of the location from which we are recording
-VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-ROOM_NAME="Salon del mar"
+CONFERENCE_NAME='DebConf9'
+VENUE_NAME="Residencia Muñoz Torrero, Cáceres, Spain"
+ROOM_NAME="Upper talkroom"
 # Sources and sinks
 SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
 SINKS="icecast:daffy file:barney"
 # Icecast streaming server parameters
-ICECAST_ADDR=lisa.dc8.debconf.org
+ICECAST_ADDR=lisa.dc9.debconf.org
 ICECAST_PORT=8000
 ICECAST_PASS=#ICECAST_PASS#
 # Stream encoding parameters