[Debconf-video-commits] r779 - fai-config/files/etc/default/debconf-video

[Holger Levsen]

Author: holger
Date: 2012-07-06 01:28:19 +0000 (Fri, 06 Jul 2012)
New Revision: 779

Modified:
   fai-config/files/etc/default/debconf-video/r1dvswitch
   fai-config/files/etc/default/debconf-video/r2dvswitch
Log:
update configs

Modified: fai-config/files/etc/default/debconf-video/r1dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r1dvswitch	2012-07-04 23:15:29 UTC (rev 778)
+++ fai-config/files/etc/default/debconf-video/r1dvswitch	2012-07-06 01:28:19 UTC (rev 779)
@@ -1,22 +1,28 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf12'
-VENUE_NAME="Universidad Centro Americana"
-ROOM_NAME="Aula Magna"
+VENUE_NAME="UCA, Managua, Nicaragua"
+ROOM_NAME="talkroom1"
+# Publication details
+PUBLISH_AUTHOR='DebConf video team'
+PUBLISH_ORG='DebConf'
+PUBLISH_LICENSE='CC-BY 3.0: http://creativecommons.org/licenses/by/3.0/'
 # Sources and sinks
-SOURCES="firewire:r1dvswitch firewire:r1grab1 firewire:r1grab2"
-SINKS="file:r1dvswitch icecast:encoder1"
+SOURCES="firewire:localhost"
+SINKS="file:localhost"
+VIDEO_STANDARD=pal
 # Icecast streaming server parameters
-ICECAST_ADDR=encoder1.dc12.debconf.org
+ICECAST_ADDR=localstream1.dc12.debconf.org
 ICECAST_PORT=8000
-ICECAST_PASS=Ieniech6
-ICECAST_PATH=/talkroom1.ogv
+ICECAST_PASS=lalasource
 # Stream encoding parameters
 VIDEO_STREAM_WIDTH=320
 VIDEO_STREAM_HEIGHT=240
 VIDEO_STREAM_KBPS=230
-VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
 AUDIO_STREAM_HZ=48000
 AUDIO_STREAM_KBPS=64
 # File store base directory
 FILE_BASE="/video"
-#FILE_SERVER="storage1"
+# Database access (pygresql)
+DATABASE_DSN="localhost:pentabarf"
+DATABASE_USER="pentabarf"
+#DATABASE_PASSWORD=

Modified: fai-config/files/etc/default/debconf-video/r2dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r2dvswitch	2012-07-04 23:15:29 UTC (rev 778)
+++ fai-config/files/etc/default/debconf-video/r2dvswitch	2012-07-06 01:28:19 UTC (rev 779)
@@ -1,22 +1,28 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf12'
-VENUE_NAME="Universidad Centro Americana"
-ROOM_NAME="Roberto Teran"
+VENUE_NAME="UCA, Managua, Nicaragua"
+ROOM_NAME="talkroom2"
+# Publication details
+PUBLISH_AUTHOR='DebConf video team'
+PUBLISH_ORG='DebConf'
+PUBLISH_LICENSE='CC-BY 3.0: http://creativecommons.org/licenses/by/3.0/'
 # Sources and sinks
-SOURCES="firewire:r2dvswitch firewire:r2grab1 firewire:r2grab2"
-SINKS="file:r2dvswitch icecast:encoder2"
+SOURCES="firewire:localhost"
+SINKS="file:localhost"
+VIDEO_STANDARD=pal
 # Icecast streaming server parameters
-ICECAST_ADDR=encoder2.dc12.debconf.org
+ICECAST_ADDR=localstream1.dc12.debconf.org
 ICECAST_PORT=8000
-ICECAST_PASS=Ieniech6
-ICECAST_PATH=/talkroom2.ogv
+ICECAST_PASS=lalasource
 # Stream encoding parameters
 VIDEO_STREAM_WIDTH=320
 VIDEO_STREAM_HEIGHT=240
 VIDEO_STREAM_KBPS=230
-VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
 AUDIO_STREAM_HZ=48000
 AUDIO_STREAM_KBPS=64
 # File store base directory
 FILE_BASE="/video"
-#FILE_SERVER="storage1"
+# Database access (pygresql)
+DATABASE_DSN="localhost:pentabarf"
+DATABASE_USER="pentabarf"
+#DATABASE_PASSWORD=