From 1ad93ae534601baf6ebaffd94f39625d43bb6c1c Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 20 Dec 2015 15:29:28 +0100
Subject: [32c3] configure subtitles-system

---
 configs/conferences/32c3/config.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'configs/conferences')

diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php
index c7fb5e5..924767e 100644
--- a/configs/conferences/32c3/config.php
+++ b/configs/conferences/32c3/config.php
@@ -278,6 +278,14 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		 */
 		'SUBTITLES' => true,
 
+		/**
+		 * ID des Raumes im L2S2-System (int)
+		 *
+		 * Wenn diese Zeile auskommentiert oder auf false gesetzt ist,
+		 * für diesen Raum das Subtitles-System deaktiviert.
+		 */
+		'SUBTITLES_ROOM_ID' => 1,
+
 		/**
 		 * Embed-Form aktivieren (boolean)
 		 *
@@ -366,6 +374,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		'SCHEDULE_NAME' => 'Hall 2',
 		'FEEDBACK' => true,
 		'SUBTITLES' => true,
+		'SUBTITLES_ROOM_ID' => 2,
 		'EMBED' => true,
 		'IRC' => true,
 		'IRC_CONFIG' => array(
@@ -394,7 +403,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		'SCHEDULE' => true,
 		'SCHEDULE_NAME' => 'Hall G',
 		'FEEDBACK' => true,
-		'SUBTITLES' => true,
+		'SUBTITLES' => false,
 		'EMBED' => true,
 		'IRC' => true,
 		'IRC_CONFIG' => array(
@@ -423,7 +432,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		'SCHEDULE' => true,
 		'SCHEDULE_NAME' => 'Hall 6',
 		'FEEDBACK' => true,
-		'SUBTITLES' => true,
+		'SUBTITLES' => false,
 		'EMBED' => true,
 		'IRC' => true,
 		'IRC_CONFIG' => array(
@@ -581,9 +590,14 @@ $GLOBALS['CONFIG']['EMBED'] = true;
  */
 $GLOBALS['CONFIG']['SUBTITLES'] = array(
 	/**
-	 * URL des L2S2-Servers
+	 * URL des L2S2 Primus-Servers
+	 */
+	'PRIMUS_URL' => 'http://fusrohda.marudor.de:63404/',
+
+	/**
+	 * URL des L2S2 Frontend-Servers
 	 */
-	'URL' => 'http://subtitles.c3voc.de/',
+	'FRONTEND_URL' => 'http://l2s2.marudor.de/',
 );
 
 /**
-- 
cgit v1.2.3